From d6856d70c8f5d6e22fea4283f20cb191c67f0a4d Mon Sep 17 00:00:00 2001 From: Nick Yeoman Date: Sat, 25 Apr 2020 15:52:39 -0700 Subject: [PATCH] fixed le for all compose files --- bookstack/docker-compose.yml | 2 +- gitea/docker-compose.yml | 2 +- lamp/docker-compose.yml | 2 +- lap/docker-compose.yml | 2 +- nextcloud/docker-compose.yml | 2 +- passbolt/docker-compose.yml | 2 +- rocketchat/docker-compose.yml | 2 +- stashapp/docker-compose.yml | 2 +- streama/docker-compose.yml | 11 ++++++----- traefik/docker-compose.yml | 6 ++---- traefik/env-sample | 2 +- yourls/docker-compose.yml | 2 +- 12 files changed, 18 insertions(+), 19 deletions(-) diff --git a/bookstack/docker-compose.yml b/bookstack/docker-compose.yml index f17fa68..eec0c40 100644 --- a/bookstack/docker-compose.yml +++ b/bookstack/docker-compose.yml @@ -57,5 +57,5 @@ services: - "traefik.enable=true" - "traefik.http.routers.${PREFIX}_bookstack.rule=Host(`${BOOKSTACK_DOMAIN_NAME}`)" - "traefik.http.routers.${PREFIX}_bookstack.entrypoints=websecure" - - "traefik.http.routers.${PREFIX}_bookstack.tls=true" + - "traefik.http.routers.${PREFIX}_bookstack.tls.certresolver=letsencrypt" - "traefik.http.services.${PREFIX}_bookstack.loadbalancer.server.port=8080" diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml index 477c6f2..740e27b 100644 --- a/gitea/docker-compose.yml +++ b/gitea/docker-compose.yml @@ -58,5 +58,5 @@ services: - "traefik.enable=true" - "traefik.http.routers.${PREFIX}_gitea.rule=Host(`${GITEA_DOMAIN_NAME}`)" - "traefik.http.routers.${PREFIX}_gitea.entrypoints=websecure" - - "traefik.http.routers.${PREFIX}_gitea.tls=true" + - "traefik.http.routers.${PREFIX}_gitea.tls.certresolver=letsencrypt" - "traefik.http.services.${PREFIX}_gitea.loadbalancer.server.port=3000" diff --git a/lamp/docker-compose.yml b/lamp/docker-compose.yml index 74b2b0c..af3527c 100644 --- a/lamp/docker-compose.yml +++ b/lamp/docker-compose.yml @@ -49,5 +49,5 @@ services: - "traefik.enable=true" - "traefik.http.routers.${PREFIX}_lamp.rule=Host(`${DOMAIN_NAME}`)" - "traefik.http.routers.${PREFIX}_lamp.entrypoints=websecure" - - "traefik.http.routers.${PREFIX}_lamp.tls=true" + - "traefik.http.routers.${PREFIX}_lamp.tls.certresolver=letsencrypt" - "traefik.http.services.${PREFIX}_lamp.loadbalancer.server.port=80" diff --git a/lap/docker-compose.yml b/lap/docker-compose.yml index 8698b5e..19a3c6f 100644 --- a/lap/docker-compose.yml +++ b/lap/docker-compose.yml @@ -27,5 +27,5 @@ services: - "traefik.enable=true" - "traefik.http.routers.${PREFIX}_lap.rule=Host(`${DOMAIN_NAME}`)" - "traefik.http.routers.${PREFIX}_lap.entrypoints=websecure" - - "traefik.http.routers.${PREFIX}_lap.tls=true" + - "traefik.http.routers.${PREFIX}_lap.tls.certresolver=letsencrypt" - "traefik.http.services.${PREFIX}_lap.loadbalancer.server.port=80" diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index 961d423..ab6b9b9 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -44,5 +44,5 @@ services: - "traefik.enable=true" - "traefik.http.routers.${PREFIX}_nextcloud.rule=Host(`${NEXTCLOUD_DOMAIN_NAME}`)" - "traefik.http.routers.${PREFIX}_nextcloud.entrypoints=websecure" - - "traefik.http.routers.${PREFIX}_nextcloud.tls=true" + - "traefik.http.routers.${PREFIX}_nextcloud.tls.certresolver=letsencrypt" - "traefik.http.services.${PREFIX}_nextcloud.loadbalancer.server.port=80" diff --git a/passbolt/docker-compose.yml b/passbolt/docker-compose.yml index aed3c56..2df6a4b 100644 --- a/passbolt/docker-compose.yml +++ b/passbolt/docker-compose.yml @@ -56,5 +56,5 @@ services: - "traefik.enable=true" - "traefik.http.routers.${PREFIX}_passbolt.rule=Host(`${DOMAIN_NAME}`)" - "traefik.http.routers.${PREFIX}_passbolt.entrypoints=websecure" - - "traefik.http.routers.${PREFIX}_passbolt.tls=true" + - "traefik.http.routers.${PREFIX}_passbolt.tls.certresolver=letsencrypt" - "traefik.http.services.${PREFIX}_passbolt.loadbalancer.server.port=80" diff --git a/rocketchat/docker-compose.yml b/rocketchat/docker-compose.yml index 5e81a56..5d1b2b2 100644 --- a/rocketchat/docker-compose.yml +++ b/rocketchat/docker-compose.yml @@ -52,7 +52,7 @@ services: - "traefik.enable=true" - "traefik.http.routers.${PREFIX}_chat.rule=Host(`${DOMAIN_NAME}`)" - "traefik.http.routers.${PREFIX}_chat.entrypoints=websecure" - - "traefik.http.routers.${PREFIX}_chat.tls=true" + - "traefik.http.routers.${PREFIX}_chat.tls.certresolver=letsencrypt" - "traefik.http.services.${PREFIX}_chat.loadbalancer.server.port=3000" rc-db: diff --git a/stashapp/docker-compose.yml b/stashapp/docker-compose.yml index 33e929e..64755ad 100644 --- a/stashapp/docker-compose.yml +++ b/stashapp/docker-compose.yml @@ -53,5 +53,5 @@ services: - "traefik.enable=true" - "traefik.http.routers.${PREFIX}_stash.rule=Host(`${DOMAIN_NAME}`)" - "traefik.http.routers.${PREFIX}_stash.entrypoints=websecure" - - "traefik.http.routers.${PREFIX}_stash.tls=true" + - "traefik.http.routers.${PREFIX}_stash.tls.certresolver=letsencrypt" - "traefik.http.services.${PREFIX}_stash.loadbalancer.server.port=9999" diff --git a/streama/docker-compose.yml b/streama/docker-compose.yml index a6f5355..ccc6f85 100644 --- a/streama/docker-compose.yml +++ b/streama/docker-compose.yml @@ -1,3 +1,4 @@ +--- version: "3" services: @@ -42,15 +43,15 @@ services: MYSQL_PASSWORD: streama_password labels: - "traefik.enable=true" - - "traefik.http.routers.nixflix.rule=Host(`nixflix.com`)" - - "traefik.http.routers.nixflix.entrypoints=websecure" - - "traefik.http.routers.nixflix.tls=true" - - "traefik.http.services.nixflix.loadbalancer.server.port=8080" + - "traefik.http.routers.${PREFIX}_streama.rule=Host(`nixflix.nickyeoman.com`)" + - "traefik.http.routers.${PREFIX}_streama.entrypoints=websecure" + - "traefik.http.routers.${PREFIX}_streama.tls.certresolver=letsencrypt" + - "traefik.http.services.${PREFIX}_streama.loadbalancer.server.port=8080" networks: traefik_web: external: - name: traefik_web + name: admin_web volumes: db_data: diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml index 5bcd408..9470d91 100644 --- a/traefik/docker-compose.yml +++ b/traefik/docker-compose.yml @@ -30,7 +30,7 @@ services: - "--providers.docker.exposedbydefault=false" - "--certificatesresolvers.letsencrypt.acme.httpchallenge=true" - "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web" - - "--certificatesresolvers.letsencrypt.acme.email=social@frostybot.com" + - "--certificatesresolvers.letsencrypt.acme.email=${TRAEFIK_LE_EMAIL}" - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json" ports: - "80:80" @@ -48,8 +48,7 @@ services: - "traefik.http.routers.traefik.entrypoints=websecure" - "traefik.http.routers.traefik.middlewares=dashboardauth" - "traefik.http.routers.traefik.middlewares=authtraefik" - #- "traefik.http.middlewares.authtraefik.basicauth.users=:" - - "traefik.http.middlewares.authtraefik.basicauth.users=nick:$$2y$$05$$XqXzcsc./tjB737OKEy8zec71XZi9Qe761cFUc71O6gLnAhG4ClU2" + - "traefik.http.middlewares.authtraefik.basicauth.users=:" # global redirect to https - "traefik.http.routers.http-catchall.rule=hostregexp(`{host:.+}`)" - "traefik.http.routers.http-catchall.entrypoints=web" @@ -57,4 +56,3 @@ services: # middleware redirect - "traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https" - "traefik.enable=true" - diff --git a/traefik/env-sample b/traefik/env-sample index 243a49a..b678388 100644 --- a/traefik/env-sample +++ b/traefik/env-sample @@ -1,7 +1,7 @@ # Domains & Project PREFIX=p1 TRAEFIK_DOMAIN_NAME=traefik.nickyeoman.com - +TRAEFIK_LE_EMAIL=email@domain.com # Passwords # https://medium.com/@techupbusiness/add-basic-authentication-in-docker-compose-files-with-traefik-34c781234970 # echo $(htpasswd -nbB "") | sed -e s/\\$/\\$\\$/g diff --git a/yourls/docker-compose.yml b/yourls/docker-compose.yml index 8efb520..137eb1b 100644 --- a/yourls/docker-compose.yml +++ b/yourls/docker-compose.yml @@ -53,5 +53,5 @@ services: - "traefik.enable=true" - "traefik.http.routers.${PREFIX}_yourls.rule=Host(`${YOURLS_DOMAIN_NAME}`)" - "traefik.http.routers.${PREFIX}_yourls.entrypoints=websecure" - - "traefik.http.routers.${PREFIX}_yourls.tls=true" + - "traefik.http.routers.${PREFIX}_yourls.tls.certresolver=letsencrypt" - "traefik.http.services.${PREFIX}_yourls.loadbalancer.server.port=80"