Compare commits

..

No commits in common. "1b1dc8995dca0f7f26ea65316edd200c7288291f" and "559c68b2dfaef75d024e7d39158d2b9d1c3d6d75" have entirely different histories.

8 changed files with 6 additions and 35 deletions

View File

@ -99,7 +99,7 @@ services:
- traefik.http.routers.{{ service }}-front.rule=Host(`{{ service }}.{{ main_domain }}`) || Host(`{{ cojedzie_domain }}`) - traefik.http.routers.{{ service }}-front.rule=Host(`{{ service }}.{{ main_domain }}`) || Host(`{{ cojedzie_domain }}`)
- traefik.http.routers.{{ service }}-front.tls=true - traefik.http.routers.{{ service }}-front.tls=true
- traefik.http.routers.{{ service }}-front.tls.certresolver=lets-encrypt - traefik.http.routers.{{ service }}-front.tls.certresolver=lets-encrypt
- traefik.http.routers.{{ service }}-front.middlewares=gzip@file - traefik.http.routers.{{ service }}-front.middlewares=cojedzie-compress@docker
- traefik.http.services.{{ service }}-front.loadbalancer.server.port=3000 - traefik.http.services.{{ service }}-front.loadbalancer.server.port=3000
volumes: volumes:

View File

@ -96,9 +96,10 @@ services:
replicas: 1 replicas: 1
labels: labels:
- traefik.enable=true - traefik.enable=true
- traefik.http.middlewares.{{ service }}-compress.compress=true
- traefik.http.routers.{{ service }}-front.rule=Host(`{{ service }}.{{ main_domain }}`) || Host(`{{ cojedzie_domain }}`) - traefik.http.routers.{{ service }}-front.rule=Host(`{{ service }}.{{ main_domain }}`) || Host(`{{ cojedzie_domain }}`)
- traefik.http.routers.{{ service }}-front.tls=true - traefik.http.routers.{{ service }}-front.tls=true
- traefik.http.routers.{{ service }}-front.middlewares=gzip@file - traefik.http.routers.{{ service }}-front.middlewares={{ service }}-compress@docker
- traefik.http.routers.{{ service }}-front.tls.certresolver=lets-encrypt - traefik.http.routers.{{ service }}-front.tls.certresolver=lets-encrypt
- traefik.http.services.{{ service }}-front.loadbalancer.server.port=3000 - traefik.http.services.{{ service }}-front.loadbalancer.server.port=3000

View File

@ -31,5 +31,4 @@ services:
- traefik.http.routers.{{ service }}.rule=Host(`git.{{ main_domain }}`) - traefik.http.routers.{{ service }}.rule=Host(`git.{{ main_domain }}`)
- traefik.http.routers.{{ service }}.tls=true - traefik.http.routers.{{ service }}.tls=true
- traefik.http.routers.{{ service }}.tls.certresolver=lets-encrypt - traefik.http.routers.{{ service }}.tls.certresolver=lets-encrypt
- traefik.http.routers.{{ service }}.middlewares=gzip@file
- traefik.http.services.{{ service }}.loadbalancer.server.port=3000 - traefik.http.services.{{ service }}.loadbalancer.server.port=3000

View File

@ -13,7 +13,6 @@ services:
labels: labels:
- traefik.enable=true - traefik.enable=true
- traefik.http.services.{{ service }}.loadbalancer.server.port=80 - traefik.http.services.{{ service }}.loadbalancer.server.port=80
- traefik.http.routers.{{ service }}.middlewares=gzip@file
{% for version in php_versions %} {% for version in php_versions %}
php-{{ version|replace('.', '') }}: php-{{ version|replace('.', '') }}:
image: kadet/php:{{ version }} image: kadet/php:{{ version }}

View File

@ -1,8 +0,0 @@
---
http:
routers:
alcoholic-calendar:
rule: Host(`{{ main_domain }}`)
service: legacy@docker
tls:
certresolver: lets-encrypt

View File

@ -1,7 +0,0 @@
---
http:
middlewares:
gzip:
compress:
excludedContentTypes:
- text/event-stream

View File

@ -18,16 +18,11 @@ entryPoints:
websecure: websecure:
address: :443 address: :443
{% if traefik_token is defined %}
pilot:
token: "{{ traefik_token }}"
{% endif %}
################################################################ ################################################################
# Traefik logs configuration # Traefik logs configuration
################################################################ ################################################################
log: log:
level: WARN level: DEBUG
format: common format: common
################################################################ ################################################################

View File

@ -16,14 +16,6 @@ services_to_restart: []
service_config: service_config:
traefik: traefik:
traefik_token: !vault |
$ANSIBLE_VAULT;1.1;AES256
66623665393638313039616464613563316437386566396238623937363238626535633937633536
6236653135363566333636633961343766323138633737610a346666636430303031373333376565
62643038666134386631306139613835623830346139356163376438643261646366386437343064
3365363639663862660a616239366130326538396431393537623964396530393531363665353361
65343938646438366264353837316263643634373639346334303939663732383832353439313330
3466323034336339626239633763393832383435623632386632
dashboard_users: dashboard_users:
- name: kadet - name: kadet
password: !vault | password: !vault |