production/production-infra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change resolving of certificates.

Browse Source
This commit is contained in:
Christian Steinle
2023-03-05 15:19:37 +01:00
parent c14189a9b3
commit 30f713042a
4 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
common/docker-compose.yaml
View File

@@ -29,10 +29,9 @@ services:
- --entryPoints.smtp-ssl.address=:465
- --entryPoints.imap-ssl.address=:993
- --entryPoints.sieve.address=:4190
- --certificatesresolvers.infomaniak.acme.dnschallenge=true
- --certificatesresolvers.infomaniak.acme.email=christiansteinle@arcor.de
- --certificatesresolvers.infomaniak.acme.dnschallenge.provider=infomaniak
- --certificatesresolvers.infomaniak.acme.storage=/letsencrypt/acme.json
- --certificatesresolvers.cs.acme.tlschallenge=true
- --certificatesresolvers.cs.acme.email=christiansteinle@arcor.de
- --certificatesresolvers.cs.acme.storage=/letsencrypt/acme.json
- --log=true
- --accessLog=true
- --metrics.prometheus=true
@@ -58,9 +57,7 @@ services:
- "traefik.http.middlewares.traefik.redirectscheme.scheme=https"
- "traefik.http.routers.traefik-secure.entrypoints=websecure"
- "traefik.http.routers.traefik-secure.rule=Host(`traefik.steinle-computer.de`)"
- "traefik.http.routers.traefik-secure.tls.certresolver=infomaniak"
- "traefik.http.routers.traefik-secure.tls.domains[0].main=steinle-computer.de"
- "traefik.http.routers.traefik-secure.tls.domains[0].sans=*.steinle-computer.de"
- "traefik.http.routers.traefik-secure.tls.certresolver=cs"
- "traefik.http.routers.traefik-secure.service=api@internal"
- "traefik.http.routers.traefik-secure.middlewares=auth"
- "traefik.http.middlewares.auth.basicauth.users=chris:$$apr1$$xe634m7n$$gpkZ11O7CrbiWAhsWKNlO1"
@@ -70,7 +67,7 @@ services:
- "traefik.http.routers.metrics.middlewares=traefik"
- "traefik.http.routers.metrics-secure.entrypoints=websecure"
- "traefik.http.routers.metrics-secure.rule=Host(`traefik.steinle-computer.de`) && PathPrefix(`/metrics`)"
- "traefik.http.routers.metrics-secure.tls.certresolver=infomaniak"
- "traefik.http.routers.metrics-secure.tls.certresolver=cs"
- "traefik.http.routers.metrics-secure.middlewares=auth"
- "traefik.http.routers.metrics-secure.service=prometheus@internal"
networks:
@@ -94,7 +91,7 @@ services:
- "traefik.http.middlewares.portainer.redirectscheme.scheme=https"
- "traefik.http.routers.portainer-secure.entrypoints=websecure"
- "traefik.http.routers.portainer-secure.rule=Host(`portainer.steinle-computer.de`)"
- "traefik.http.routers.portainer-secure.tls.certresolver=infomaniak"
- "traefik.http.routers.portainer-secure.tls.certresolver=cs"
- "traefik.http.services.portainer-secure.loadbalancer.server.port=9000"

6
huber-putz/docker-compose.yaml
View File

@@ -20,11 +20,7 @@ services:
- "traefik.http.routers.huber-putz-secure.rule=Host(`huber-stuck.de`, `www.huber-stuck.de`, `huber-putz.com`, `www.huber-putz.com`)"
- "traefik.http.routers.huber-putz-secure.entrypoints=websecure"
- "traefik.http.routers.huber-putz-secure.tls=true"
- "traefik.http.routers.huber-putz-secure.tls.certresolver=infomaniak"
- "traefik.http.routers.huber-putz-secure.tls.domains[0].main=huber-stuck.de"
- "traefik.http.routers.huber-putz-secure.tls.domains[0].sans=*.huber-stuck.de"
- "traefik.http.routers.huber-putz-secure.tls.domains[1].main=huber-putz.com"
- "traefik.http.routers.huber-putz-secure.tls.domains[1].sans=*.huber-putz.com"
- "traefik.http.routers.huber-putz-secure.tls.certresolver=cs"
- "traefik.http.routers.huber-putz-secure.service=huber-putz-secure"
- "traefik.http.services.huber-putz-secure.loadbalancer.server.port=8080"

6
mail/docker-compose.yaml
View File

@@ -104,14 +104,14 @@ services:
- mail
labels:
- "traefik.enable=true"
- "traefik.http.routers.roundcube.rule=Host(`webmail.steinle-computer.de`)"
- "traefik.http.routers.roundcube.rule=Host(`webmail.steinle-computer.de`, 'mail.steinle-computer.de`)"
- "traefik.http.routers.roundcube.entrypoints=web"
- "traefik.http.routers.roundcube.middlewares=roundcube"
- "traefik.http.middlewares.roundcube.redirectscheme.scheme=https"
- "traefik.http.routers.roundcube-secure.rule=Host(`webmail.steinle-computer.de`)"
- "traefik.http.routers.roundcube-secure.rule=Host(`webmail.steinle-computer.de`, `mail.steinle-computer.de`)"
- "traefik.http.routers.roundcube-secure.entrypoints=websecure"
- "traefik.http.routers.roundcube-secure.tls=true"
- "traefik.http.routers.roundcube-secure.tls.certresolver=infomaniak"
- "traefik.http.routers.roundcube-secure.tls.certresolver=cs"
- "traefik.http.routers.roundcube-secure.service=roundcube-secure"
- "traefik.http.services.roundcube-secure.loadbalancer.server.port=80"

2
monitoring/docker-compose.yaml
View File

@@ -70,7 +70,7 @@ services:
- "traefik.http.routers.grafana-secure.entrypoints=websecure"
- "traefik.http.routers.grafana-secure.service=grafana-secure"
- "traefik.http.routers.grafana-secure.tls=true"
- "traefik.http.routers.grafana-secure.tls.certresolver=infomaniak"
- "traefik.http.routers.grafana-secure.tls.certresolver=cs"
- "traefik.http.services.grafana-secure.loadbalancer.server.port=3000"
watchtower: