diff --git a/monitoring/docker-compose.yml b/monitoring/docker-compose.yml index ab26041..6664d73 100644 --- a/monitoring/docker-compose.yml +++ b/monitoring/docker-compose.yml @@ -16,9 +16,17 @@ services: restart: unless-stopped labels: - "traefik.enable=true" - - "traefik.http.routers.grafana.entrypoints=http" - - "traefik.http.routers.grafana.rule=Host(`${GRAFANA_HOST}`)" + - "traefik.http.services.grafana.loadbalancer.server.port=3000" + + - "traefik.http.routers.grafana.entrypoints=http" + - "traefik.http.routers.grafana-http.middlewares=https-redirect@docker" + - "traefik.http.routers.grafana.rule=Host(`${GRAFANA_HOST}`)" + + - "traefik.http.routers.grafana-https.entrypoints=https" + - "traefik.http.routers.grafana-https.tls=true" + - "traefik.http.routers.grafana-https.tls.certresolver=letsencrypt" + - "traefik.http.routers.grafana-https.rule=Host(`${GRAFANA_HOST}`)" networks: - web - monitoring @@ -37,9 +45,17 @@ services: - '--storage.tsdb.retention.time=365d' labels: - "traefik.enable=true" - - "traefik.http.routers.prometheus.entrypoints=http" - - "traefik.http.routers.prometheus.rule=Host(`${PROMETHEUS_HOST}`)" + - "traefik.http.services.prometheus.loadbalancer.server.port=9090" + + - "traefik.http.routers.prometheus.entrypoints=http" + - "traefik.http.routers.prometheus-http.middlewares=https-redirect@docker" + - "traefik.http.routers.prometheus.rule=Host(`${PROMETHEUS_HOST}`)" + + - "traefik.http.routers.prometheus-https.entrypoints=https" + - "traefik.http.routers.prometheus-https.tls=true" + - "traefik.http.routers.prometheus-https.tls.certresolver=letsencrypt" + - "traefik.http.routers.prometheus-https.rule=Host(`${PROMETHEUS_HOST}`)" networks: - web - monitoring diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml index d396151..74962d2 100644 --- a/traefik/docker-compose.yml +++ b/traefik/docker-compose.yml @@ -18,3 +18,6 @@ services: - './traefik.yml:/etc/traefik/traefik.yml' - './acme.json:/acme.json' - '/var/run/docker.sock:/var/run/docker.sock:ro' + labels: + - "traefik.http.middlewares.https-redirect.redirectscheme.scheme=https" + - "traefik.http.middlewares.https-redirect.redirectscheme.permanent=true"