diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 00b0ab74..be496e01 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -27,5 +27,5 @@ services: ## docker compose up -d traefik caddy php1 php2 php3 php4 php5 db redis ## ## Notes: -## - Traefik uses Let’s Encrypt production. Ensure DNS A/AAAA records for api.truckwash.dk and traefik.truckwash.dk point to this host and ports 80/443 are reachable. +## - Traefik uses Let’s Encrypt production. Ensure DNS A/AAAA records for api.truckwash.dk, api.truckwash.io and traefik.truckwash.dk point to this host and ports 80/443 are reachable. ## - The dashboard is protected by basic auth and an IP allowlist (defined in dynamic.yml). Replace the bcrypt hash before enabling in production. \ No newline at end of file diff --git a/services/traefik/acme.json b/services/traefik/acme.json index e69de29b..0967ef42 100644 --- a/services/traefik/acme.json +++ b/services/traefik/acme.json @@ -0,0 +1 @@ +{} diff --git a/services/traefik/dynamic.yml b/services/traefik/dynamic.yml index 60ece439..57a5c05e 100644 --- a/services/traefik/dynamic.yml +++ b/services/traefik/dynamic.yml @@ -34,7 +34,7 @@ http: service: noop@internal priority: 1000 tls: - certResolver: le + certResolver: le_io domains: - main: api.truckwash.io diff --git a/services/traefik/traefik.prod.yml b/services/traefik/traefik.prod.yml index eccfd5cb..974bb24b 100644 --- a/services/traefik/traefik.prod.yml +++ b/services/traefik/traefik.prod.yml @@ -4,6 +4,18 @@ entryPoints: websecure: address: ":443" +certificatesResolvers: + le: + acme: + email: jb@truckwash.dk + storage: /acme.json + tlsChallenge: {} + le_io: + acme: + email: jb@truckwash.dk + storage: /acme-io.json + tlsChallenge: {} + providers: docker: exposedByDefault: false @@ -18,15 +30,3 @@ log: level: WARN accessLog: {} - -certificatesResolvers: - le: - acme: - email: jb@truckwash.dk - storage: /acme.json - tlsChallenge: {} - le_io: - acme: - email: jb@truckwash.dk - storage: /acme-io.json - tlsChallenge: {} \ No newline at end of file diff --git a/services/traefik/traefik.yml b/services/traefik/traefik.yml index 282ee92e..07242eff 100644 --- a/services/traefik/traefik.yml +++ b/services/traefik/traefik.yml @@ -6,6 +6,18 @@ entryPoints: metrics: address: ":9100" +certificatesResolvers: + le: + acme: + email: jb@truckwash.dk + storage: /acme.json + tlsChallenge: {} + le_io: + acme: + email: jb@truckwash.dk + storage: /acme-io.json + tlsChallenge: {} + providers: docker: exposedByDefault: false @@ -36,15 +48,3 @@ tracing: samplingParam: 1.0 localAgentHostPort: jaeger:6831 traceContextHeaderName: uber-trace-id - -certificatesResolvers: - le: - acme: - email: jb@truckwash.dk - storage: /acme.json - tlsChallenge: {} - le_io: - acme: - email: jb@truckwash.dk - storage: /acme-io.json - tlsChallenge: {}