monitoring/docker-compose.yaml

@@ -2,7 +2,7 @@ version: "3.3"
 services:
 
   grafana:
-    image: grafana/grafana:${GRAFANA_VERSION}
+    image: grafana/grafana:7.5.6
     restart: unless-stopped
     networks:
       - web
@@ -37,7 +37,7 @@ services:
 
 
   grafanadb:
-    image: postgres:${POSTGRES_VERSION}
+    image: postgres:13
     volumes:
       - ${VOLUMES_PATH}/grafanadb:/var/lib/postgresql/data
     networks:
@@ -52,7 +52,7 @@ services:
 
 
   influxdb:
-    image: influxdb:${INFLUXDB_VERSION}
+    image: influxdb:1.8
     restart: unless-stopped
     networks:
       - web
@@ -78,7 +78,7 @@ services:
   # here starts data collection
 
   telegraf_host:
-    image: telegraf:${TELEGRAF_VERSION}
+    image: telegraf:1.18
     restart: unless-stopped
     environment:
       - HOST_MOUNT_PREFIX=/hostfs
@@ -101,7 +101,7 @@ services:
       - influxdb
 
   telegraf_net:
-    image: telegraf:${TELEGRAF_VERSION}
+    image: telegraf:1.18
     restart: unless-stopped
     env_file:
       - ./.env # set environments into container

www/docker-compose.yaml

@@ -11,18 +11,10 @@ services:
     restart: unless-stopped
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.webroot.entrypoints=websecure" # All HTTP requests are globally redirected to HTTPS
-      - "traefik.http.routers.webroot.rule=Host(`${DOMAIN}`)"
-      - "traefik.http.routers.webroot.tls.certresolver=netcup"
-      - "traefik.http.routers.webroot.tls.options=intermediate@file"
-      - "traefik.http.routers.webroot.middlewares=redirect-to-www"
-      - "traefik.http.middlewares.redirect-to-www.redirectregex.regex=^https?://florianzirker.de/(.*)"
-      - "traefik.http.middlewares.redirect-to-www.redirectregex.replacement=https://www.florianzirker.de/$${1}"
-      - "traefik.http.middlewares.redirect-to-www.redirectregex.permanent=true"
-      - "traefik.http.routers.www-secure.entrypoints=websecure"
-      - "traefik.http.routers.www-secure.rule=Host(`www.${DOMAIN}`)"
-      - "traefik.http.routers.www-secure.tls.certresolver=netcup"
-      - "traefik.http.routers.www-secure.tls.options=intermediate@file"
+      - "traefik.http.routers.web-secure.entrypoints=websecure"
+      - "traefik.http.routers.web-secure.rule=Host(`${DOMAIN}`) || Host(`www.${DOMAIN}`)"
+      - "traefik.http.routers.web-secure.tls.certresolver=netcup"
+      - "traefik.http.routers.web-secure.tls.options=intermediate@file"
       - "docker.group=www"
 
 networks: