diff --git a/compute-1-mep/forgejo/docker-compose.yaml b/compute-1-mep/forgejo/docker-compose.yaml index 3d0edcb..c9d6469 100644 --- a/compute-1-mep/forgejo/docker-compose.yaml +++ b/compute-1-mep/forgejo/docker-compose.yaml @@ -71,6 +71,7 @@ services: - "traefik.http.services.forgejo-service-gnous.loadbalancer.server.port=3001" - "traefik.http.routers.forgejognous.rule=(Host(`git.gnous.eu`) && !Path(`/metrics`))" - "traefik.http.routers.forgejognous.tls=true" + - "traefik.http.routers.forgejognous.tls.certresolver=defaultacme" - "traefik.http.routers.forgejognous.entrypoints=websecure" - "traefik.http.routers.forgejognous.service=forgejo-service-gnous" - "traefik.http.routers.forgejognous.middlewares=proxyHeader@file,proxyError@file" diff --git a/compute-1-mep/freshrss/docker-compose.yaml b/compute-1-mep/freshrss/docker-compose.yaml index 9c852a2..29c954c 100644 --- a/compute-1-mep/freshrss/docker-compose.yaml +++ b/compute-1-mep/freshrss/docker-compose.yaml @@ -26,6 +26,7 @@ services: - "traefik.http.routers.freshrss.entryPoints=websecure" - "traefik.http.routers.freshrss.rule=Host(`rss.gnous.eu`)" - "traefik.http.routers.freshrss.tls=true" + - "traefik.http.routers.freshrss.tls.certresolver=defaultacme" - "traefik.http.routers.freshrss.middlewares=proxyHeader@file,proxyError@file" env_file: - path: .env diff --git a/compute-1-mep/haste/docker-compose.yaml b/compute-1-mep/haste/docker-compose.yaml index 1f3a557..a7ff82c 100644 --- a/compute-1-mep/haste/docker-compose.yaml +++ b/compute-1-mep/haste/docker-compose.yaml @@ -19,6 +19,7 @@ services: - "traefik.http.routers.gnoushaste.entryPoints=websecure" - "traefik.http.routers.gnoushaste.rule=Host(`haste.gnous.eu`)" - "traefik.http.routers.gnoushaste.tls=true" + - "traefik.http.routers.gnoushaste.tls.certresolver=defaultacme" - "traefik.http.routers.gnoushaste.middlewares=proxyHeader@file,proxyError@file" env_file: - path: .env diff --git a/compute-1-mep/searx/docker-compose.yaml b/compute-1-mep/searx/docker-compose.yaml index a1863fb..a8c8dab 100644 --- a/compute-1-mep/searx/docker-compose.yaml +++ b/compute-1-mep/searx/docker-compose.yaml @@ -36,6 +36,7 @@ services: - "traefik.http.routers.searx.entryPoints=websecure" - "traefik.http.routers.searx.rule=Host(`searx.gnous.eu`)" - "traefik.http.routers.searx.tls=true" + - "traefik.http.routers.searx.tls.certresolver=defaultacme" - "traefik.http.routers.searx.middlewares=proxyHeader@file,proxyError@file" redis: image: "redis:7.4-alpine" diff --git a/compute-1-mep/wallabag/docker-compose.yaml b/compute-1-mep/wallabag/docker-compose.yaml index 44b443b..52fb18a 100644 --- a/compute-1-mep/wallabag/docker-compose.yaml +++ b/compute-1-mep/wallabag/docker-compose.yaml @@ -49,6 +49,7 @@ services: - "traefik.http.services.wallabag-service-gnous.loadbalancer.server.port=3009" - "traefik.http.routers.wallabaggnous.rule=Host(`bag.gnous.eu`)" - "traefik.http.routers.wallabaggnous.tls=true" + - "traefik.http.routers.wallabaggnous.tls.certresolver=defaultacme" - "traefik.http.routers.wallabaggnous.entrypoints=websecure" - "traefik.http.routers.wallabaggnous.service=wallabag-service-gnous" - "traefik.http.routers.wallabaggnous.middlewares=proxyHeader@file,proxyError@file" diff --git a/compute-1-mep/wiki/docker-compose.yaml b/compute-1-mep/wiki/docker-compose.yaml index 5b54095..9e0d7fd 100644 --- a/compute-1-mep/wiki/docker-compose.yaml +++ b/compute-1-mep/wiki/docker-compose.yaml @@ -13,5 +13,6 @@ services: - "traefik.http.routers.wiki.entryPoints=websecure" - "traefik.http.routers.wiki.rule=Host(`wiki.gnous.eu`)" - "traefik.http.routers.wiki.tls=true" + - "traefik.http.routers.wiki.tls.certresolver=defaultacme" - "traefik.http.routers.wiki.middlewares=proxyHeader@file,proxyError@file" diff --git a/compute-2-mep/gitlab/docker-compose.yaml b/compute-2-mep/gitlab/docker-compose.yaml index 1ba27cc..4ac71ea 100644 --- a/compute-2-mep/gitlab/docker-compose.yaml +++ b/compute-2-mep/gitlab/docker-compose.yaml @@ -49,6 +49,7 @@ services: - "traefik.http.services.gitlab-gnous.loadbalancer.server.port=3005" - "traefik.http.routers.gitlabgnous.rule=Host(`gitlab.gnous.eu`)" - "traefik.http.routers.gitlabgnous.tls=true" + - "traefik.http.routers.gitlabgnous.tls.certresolver=defaultacme" - "traefik.http.routers.gitlabgnous.entrypoints=websecure" - "traefik.http.routers.gitlabgnous.service=gitlab-gnous" - "traefik.http.routers.gitlabgnous.middlewares=proxyHeader@file,proxyError@file" @@ -56,6 +57,7 @@ services: - "traefik.http.services.registry-gnous.loadbalancer.server.port=3006" - "traefik.http.routers.registrygnous.rule=Host(`pkg.gnous.eu`)" - "traefik.http.routers.registrygnous.tls=true" + - "traefik.http.routers.registrygnous.tls.certresolver=defaultacme" - "traefik.http.routers.registrygnous.entrypoints=websecure" - "traefik.http.routers.registrygnous.service=registry-gnous" - "traefik.http.routers.registrygnous.middlewares=proxyHeader@file,proxyError@file" @@ -63,4 +65,4 @@ services: - "traefik.tcp.routers.gitlabssh.entrypoints=sshgitlab" - "traefik.tcp.routers.gitlabssh.rule=HostSNI(`*`)" - "traefik.tcp.routers.gitlabssh.service=gitlab-ssh" - - "traefik.tcp.services.gitlab-ssh.loadbalancer.server.address=gitlab:22" \ No newline at end of file + - "traefik.tcp.services.gitlab-ssh.loadbalancer.server.port=3007" diff --git a/compute-2-mep/gnous_frontend/docker-compose.yaml b/compute-2-mep/gnous_frontend/docker-compose.yaml index 930ac7a..0f61b8b 100644 --- a/compute-2-mep/gnous_frontend/docker-compose.yaml +++ b/compute-2-mep/gnous_frontend/docker-compose.yaml @@ -14,4 +14,5 @@ services: - "traefik.http.routers.gnousdoteu.entryPoints=websecure" - "traefik.http.routers.gnousdoteu.rule=Host(`gnous.eu`)" - "traefik.http.routers.gnousdoteu.tls=true" + - "traefik.http.routers.gnousdoteu.tls.certresolver=defaultacme" - "traefik.http.routers.gnousdoteu.middlewares=proxyHeader@file,proxyError@file" diff --git a/compute-2-mep/mastodon/docker-compose.yaml b/compute-2-mep/mastodon/docker-compose.yaml index ea257a1..8ed3fa9 100644 --- a/compute-2-mep/mastodon/docker-compose.yaml +++ b/compute-2-mep/mastodon/docker-compose.yaml @@ -34,6 +34,7 @@ services: - "traefik.http.routers.mastodon-web.entrypoints=websecure" - "traefik.http.routers.mastodon-web.rule=Host(`toot.gnous.eu`)" - "traefik.http.routers.mastodon-web.tls=true" + - "traefik.http.routers.mastodon-web.tls.certresolver=defaultacme" - "traefik.http.routers.mastodon-web.middlewares=proxyHeader@file,proxyError@file" # Cron - "ofelia.enabled=true" @@ -63,7 +64,9 @@ services: - "traefik.enable=true" - "traefik.http.routers.mastodon-streaming.entrypoints=websecure" - "traefik.http.routers.mastodon-streaming.rule=(Host(`toot.gnous.eu`) && PathPrefix(`/api/v1/streaming`))" + - "traefik.http.routers.mastodon-streaming.tls.certresolver=letsencrypt" - "traefik.http.routers.mastodon-streaming.tls=true" + - "traefik.http.routers.mastodon-streaming.tls.certresolver=defaultacme" - "traefik.http.routers.mastodon-streaming.middlewares=proxyHeader@file,proxyError@file" sidekiq: diff --git a/compute-2-mep/vaultwarden/docker-compose.yaml b/compute-2-mep/vaultwarden/docker-compose.yaml index 3bbd32a..264601b 100644 --- a/compute-2-mep/vaultwarden/docker-compose.yaml +++ b/compute-2-mep/vaultwarden/docker-compose.yaml @@ -25,6 +25,7 @@ services: - "traefik.http.routers.vaultwarden.entryPoints=websecure" - "traefik.http.routers.vaultwarden.rule=Host(`pass.gnous.eu`)" - "traefik.http.routers.vaultwarden.tls=true" + - "traefik.http.routers.vaultwarden.tls.certresolver=defaultacme" - "traefik.http.routers.vaultwarden.middlewares=proxyHeader@file,proxyError@file" restart: always volumes: diff --git a/compute-2-mep/woodpecker/docker-compose.yaml b/compute-2-mep/woodpecker/docker-compose.yaml index 078d677..cb97bfb 100644 --- a/compute-2-mep/woodpecker/docker-compose.yaml +++ b/compute-2-mep/woodpecker/docker-compose.yaml @@ -41,6 +41,7 @@ services: - "traefik.http.services.woodpecker-service-gnous.loadbalancer.server.port=4001" - "traefik.http.routers.woodpeckergnous.rule=Host(`cicd.gnous.eu`)" - "traefik.http.routers.woodpeckergnous.tls=true" + - "traefik.http.routers.woodpeckergnous.tls.certresolver=defaultacme" - "traefik.http.routers.woodpeckergnous.entrypoints=websecure" - "traefik.http.routers.woodpeckergnous.service=woodpecker-service-gnous" - "traefik.http.routers.woodpeckergnous.middlewares=proxyHeader@file,proxyError@file" @@ -49,6 +50,7 @@ services: - "traefik.http.services.woodpecker-grpc-gnous.loadbalancer.server.scheme=h2c" - "traefik.http.routers.woodpecker-grpc-gnous.rule=Host(`grpc.cicd.gnous.eu`)" - "traefik.http.routers.woodpecker-grpc-gnous.tls=true" + - "traefik.http.routers.woodpecker-grpc-gnous.tls.certresolver=defaultacme" - "traefik.http.routers.woodpecker-grpc-gnous.entrypoints=websecure" - "traefik.http.routers.woodpecker-grpc-gnous.service=woodpecker-grpc-gnous" - "traefik.http.routers.woodpecker-grpc-gnous.middlewares=woodpecker-grpc-redirect@docker" diff --git a/internals/komodo/docker-compose.yaml b/internals/komodo/docker-compose.yaml index 61ead34..9bec574 100644 --- a/internals/komodo/docker-compose.yaml +++ b/internals/komodo/docker-compose.yaml @@ -43,6 +43,7 @@ services: - "traefik.http.routers.komodo.entryPoints=websecure" - "traefik.http.routers.komodo.rule=Host(`deploy.net.enpls.org`)" - "traefik.http.routers.komodo.tls=true" + - "traefik.http.routers.komodo.tls.certresolver=defaultacme" - "traefik.http.routers.komodo.middlewares=proxyHeader@file,proxyError@file" - "komodo.skip:" diff --git a/internals/semaphore/docker-compose.yaml b/internals/semaphore/docker-compose.yaml index 65a0e5a..6fcfb7e 100644 --- a/internals/semaphore/docker-compose.yaml +++ b/internals/semaphore/docker-compose.yaml @@ -32,6 +32,7 @@ services: - "traefik.http.services.semaphore-service.loadbalancer.server.port=8085" - "traefik.http.routers.semaphore.rule=Host(`semaphore.net.enpls.org`)" - "traefik.http.routers.semaphore.tls=true" + - "traefik.http.routers.semaphore.tls.certresolver=defaultacme" - "traefik.http.routers.semaphore.entrypoints=websecure" - "traefik.http.routers.semaphore.service=semaphore-service" - "traefik.http.routers.semaphore.middlewares=proxyHeader@file,proxyError@file" diff --git a/internals/wikijs/docker-compose.yaml b/internals/wikijs/docker-compose.yaml index 82bd133..9da6f4d 100644 --- a/internals/wikijs/docker-compose.yaml +++ b/internals/wikijs/docker-compose.yaml @@ -27,6 +27,7 @@ services: - "traefik.http.routers.wikijs.entryPoints=websecure" - "traefik.http.routers.wikijs.rule=Host(`doc.net.enpls.org`)" - "traefik.http.routers.wikijs.tls=true" + - "traefik.http.routers.wikijs.tls.certresolver=defaultacme" - "traefik.http.routers.wikijs.middlewares=proxyHeader@file,proxyError@file" volumes: diff --git a/internals/woodpecker/docker-compose.yaml b/internals/woodpecker/docker-compose.yaml index f2432ad..713dc50 100644 --- a/internals/woodpecker/docker-compose.yaml +++ b/internals/woodpecker/docker-compose.yaml @@ -24,7 +24,6 @@ services: - WOODPECKER_GITEA=true - WOODPECKER_GITEA_URL=https://git.gnous.eu - WOODPECKER_DATABASE_DRIVER=postgres - - WOODPECKER_PLUGINS_PRIVILEGED=woodpeckerci/plugin-docker-buildx:5.2 env_file: - .env restart: always @@ -41,6 +40,7 @@ services: - "traefik.http.services.woodpecker-service.loadbalancer.server.port=8083" - "traefik.http.routers.woodpecker.rule=Host(`build.net.enpls.org`)" - "traefik.http.routers.woodpecker.tls=true" + - "traefik.http.routers.woodpecker.tls.certresolver=defaultacme" - "traefik.http.routers.woodpecker.entrypoints=websecure" - "traefik.http.routers.woodpecker.service=woodpecker-service" - "traefik.http.routers.woodpecker.middlewares=proxyHeader@file,proxyError@file" @@ -49,6 +49,7 @@ services: - "traefik.http.services.woodpecker-grpc.loadbalancer.server.scheme=h2c" - "traefik.http.routers.woodpecker-grpc-secure.rule=Host(`grpc.build.net.enpls.org`)" - "traefik.http.routers.woodpecker-grpc-secure.tls=true" + - "traefik.http.routers.woodpecker-grpc-secure.tls.certresolver=defaultacme" - "traefik.http.routers.woodpecker-grpc-secure.entrypoints=websecure" - "traefik.http.routers.woodpecker-grpc-secure.service=woodpecker-grpc" - "traefik.http.routers.woodpecker-grpc.middlewares=woodpecker-grpc-redirect@docker"