diff --git a/.env.secret b/.env.secret index 8a6d5f4..2615d76 100644 --- a/.env.secret +++ b/.env.secret Binary files differ diff --git a/.gitsecret/paths/mapping.cfg b/.gitsecret/paths/mapping.cfg index 252821f..fd6ba91 100644 --- a/.gitsecret/paths/mapping.cfg +++ b/.gitsecret/paths/mapping.cfg @@ -1,2 +1,2 @@ -.env:423886795eff8d995b905bcc689f70f63ed58376c4fa878ce6b791711efc50b0 +.env:221a7702774fdc6c4a5fa42a1f0787c10d34e347ff57a1c3ee841021c32caba5 wg-server/initial_config/wg-server.conf:5d4fe70ae728a4fd41dbd0323899057884e12d1dd55fb5e0f440562ebaacc34b diff --git a/docker-compose.yml b/docker-compose.yml index a32ed73..7330999 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,26 +14,9 @@ - web command: --providers.docker - - --entryPoints.web.address=:80 - --entrypoints.web.http.redirections.entryPoint.to=websecure - --entrypoints.web.http.redirections.entryPoint.scheme=https - --entrypoints.web.http.redirections.entrypoint.permanent=true - --certificatesresolvers.letsencrypt.acme.storage=/acme/acme.json - - --certificatesresolvers.letsencrypt.acme.email=admin@local-company.com - --certificatesresolvers.letsencrypt.acme.dnschallenge=true - --certificatesresolvers.letsencrypt.acme.dnschallenge.provider=cloudflare - - --entryPoints.websecure.address=:443 - --entrypoints.websecure.http.tls=true - --entrypoints.websecure.http.tls.certResolver=letsencrypt - --entrypoints.websecure.http.tls.domains[0].main=skyw.me - --entrypoints.websecure.http.tls.domains[0].sans=*.skyw.me - - environment: - - CF_DNS_API_TOKEN=${DNS_CHALLENGE_CLOUDFLARE_API_KEY} + --entrypoints.web.address=:80 + --entrypoints.web.http.tls=false extra_hosts: - "host.docker.internal:host-gateway" @@ -57,9 +40,7 @@ networks: - web labels: - - traefik.http.routers.ldap-passwd-webui.rule=Host(`passwd.skyw.me`) - - traefik.http.routers.ldap-passwd-webui.entrypoints=websecure - - traefik.http.routers.ldap-passwd-webui.tls.certresolver=letsencrypt + - traefik.http.routers.ldap-passwd-webui.rule=Host(`passwd.localhost`) - traefik.http.services.ldap-passwd-webui.loadbalancer.server.port=8080 # wireguard server @@ -71,11 +52,8 @@ # networks: # - web labels: - - traefik.http.routers.wg-server.rule=Host(`wg.skyw.me`) - - traefik.http.routers.wg-server.entrypoints=websecure - - traefik.http.routers.wg-server.tls.certresolver=letsencrypt + - traefik.http.routers.wg-server.rule=Host(`wg.localhost`) - traefik.http.services.wg-server.loadbalancer.server.port=8123 - - traefik.http.services.wg-server.loadbalancer.server.url=http://host.docker.internal:8123 # wiki wiki-db: @@ -92,9 +70,7 @@ networks: - web labels: - - traefik.http.routers.wiki-server.rule=Host(`skyw.me`) || Host(`www.skyw.me`) || Host(`wiki.skyw.me`) - - traefik.http.routers.wiki-server.entrypoints=websecure - - traefik.http.routers.wiki-server.tls.certresolver=letsencrypt + - traefik.http.routers.wiki-server.rule=Host(`localhost`) || Host(`www.localhost`) || Host(`wiki.localhost`) - traefik.http.services.wiki-server.loadbalancer.server.port=3000 networks: diff --git a/wg-server/initial_config/wg-server.conf.secret b/wg-server/initial_config/wg-server.conf.secret index 6c5e87b..cafa92b 100644 --- a/wg-server/initial_config/wg-server.conf.secret +++ b/wg-server/initial_config/wg-server.conf.secret Binary files differ