Merge pull request #73 from mr-bolle/master

globale http zu https Weiterleitung

README.md

@@ -85,4 +85,5 @@ Alphabetisch sortiert
 * Wallabag (https://www.wallabag.it/de/)
 * Watchtower (https://github.com/containrrr/watchtower)
 * Wiki.js (https://wiki.js.org)
+* WireHole (https://github.com/IAmStoxe/wirehole)
 * Wordpress (https://de.wordpress.org)

bitwarden_rs/docker-compose.yaml

@@ -12,11 +12,7 @@ services:
       - /var/docker/bitwarden:/data
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.bitwarden-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.bitwarden-http.entrypoints=web"
-      - "traefik.http.routers.bitwarden-http.rule=Host(`${BITWARDEN_URL}`)"
-      - "traefik.http.routers.bitwarden-http.middlewares=bitwarden-https@docker"
-      - "traefik.http.routers.bitwarden.entrypoints=web-secure"
+      - "traefik.http.routers.bitwarden.entrypoints=websecure"
       - "traefik.http.routers.bitwarden.rule=Host(`${BITWARDEN_URL}`)"
       - "traefik.http.routers.bitwarden.tls=true"
       - "traefik.http.routers.bitwarden.tls.certresolver=default"

bookstack/docker-compose.yaml

@@ -35,11 +35,7 @@ services:
       - APP_URL=https://${BOOKSTACK_URL}  # Zeile auskommentieren, wenn kein Traefik verwendet wird!
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.bookstack-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.bookstack-http.entrypoints=web"
-      - "traefik.http.routers.bookstack-http.rule=Host(`${BOOKSTACK_URL}`)"
-      - "traefik.http.routers.bookstack-http.middlewares=bookstack-https@docker"
-      - "traefik.http.routers.bookstack.entrypoints=web-secure"
+      - "traefik.http.routers.bookstack.entrypoints=websecure"
       - "traefik.http.routers.bookstack.rule=Host(`${BOOKSTACK_URL}`)"
       - "traefik.http.routers.bookstack.tls=true"
       - "traefik.http.routers.bookstack.tls.certresolver=default"

calibre/docker-compose.yaml

@@ -12,7 +12,6 @@ services:
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=Europe/Berlin
 
   calibre-web:
     image: linuxserver/calibre-web
@@ -26,17 +25,12 @@ services:
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=Europe/Berlin
       - DOCKER_MODS=linuxserver/calibre-web:calibre
     depends_on:
       - calibre
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.calibre-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.calibre-http.entrypoints=web"
-      - "traefik.http.routers.calibre-http.rule=Host(`${CALIBRE_URL}`)"
-      - "traefik.http.routers.calibre-http.middlewares=calibre-https@docker"
-      - "traefik.http.routers.calibre.entrypoints=web-secure"
+      - "traefik.http.routers.calibre.entrypoints=websecure"
       - "traefik.http.routers.calibre.rule=Host(`${CALIBRE_URL}`)"
       - "traefik.http.routers.calibre.tls=true"
       - "traefik.http.routers.calibre.tls.certresolver=default"

droneio/docker-compse.yaml

@@ -9,7 +9,7 @@ services:
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
-      - $PWD/data:/data
+      - /var/docker/droneio-data:/data
     environment:
       - DRONE_GITEA_SERVER=https://drone.example.com  # Bitte URL anpassen
       - DRONE_GITEA_CLIENT_ID=  # GITEA Client ID
@@ -19,11 +19,7 @@ services:
       - DRONE_SERVER_PROTO=https
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.drone-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.drone-http.entrypoints=web"
-      - "traefik.http.routers.drone-http.rule=Host(`drone.example.com`)"  # Domain anpassen
-      - "traefik.http.routers.drone-http.middlewares=drone-https@docker"
-      - "traefik.http.routers.drone.entrypoints=web-secure"
+      - "traefik.http.routers.drone.entrypoints=websecure"
       - "traefik.http.routers.drone.rule=Host(`drone.example.com`)"  # Domain anpassen
       - "traefik.http.routers.drone.tls=true"
       - "traefik.http.routers.drone.tls.certresolver=default"

freescout/docker-compose.yaml

@@ -25,11 +25,7 @@ services:
       - TIMEZONE=Europe/Berlin
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.freescout-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.freescout-http.entrypoints=web"
-      - "traefik.http.routers.freescout-http.rule=Host(`${FREESCOUT_URL}`)"
-      - "traefik.http.routers.freescout-http.middlewares=freescout-https@docker"
-      - "traefik.http.routers.freescout.entrypoints=web-secure"
+      - "traefik.http.routers.freescout.entrypoints=websecure"
       - "traefik.http.routers.freescout.rule=Host(`${FREESCOUT_URL}`)"
       - "traefik.http.routers.freescout.tls=true"
       - "traefik.http.routers.freescout.tls.certresolver=default"

freshrss/docker-compose.yaml

@@ -28,14 +28,9 @@ services:
       - /var/docker/freshrss/extensions:/var/www/FreshRSS/extensions
     environment:
       - CRON_MIN=*/20
-      - TZ=Europe/Berlin
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.freshrss-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.freshrss-http.entrypoints=web"
-      - "traefik.http.routers.freshrss-http.rule=Host(`${FRESHRSS_URL`)"  # Domain anpassen
-      - "traefik.http.routers.freshrss-http.middlewares=freshrss-https@docker"
-      - "traefik.http.routers.freshrss.entrypoints=web-secure"
+      - "traefik.http.routers.freshrss.entrypoints=websecure"
       - "traefik.http.routers.freshrss.rule=Host(`${FRESHRSS_URL`)"  # Domain anpassen
       - "traefik.http.routers.freshrss.tls=true"
       - "traefik.http.routers.freshrss.tls.certresolver=default"

gitea/docker-compose.yaml

@@ -34,11 +34,7 @@ services:
       - DB_PASSWD=${MYSQL_PASSWORD}
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.gitea-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.gitea-http.entrypoints=web"
-      - "traefik.http.routers.gitea-http.rule=Host(`${GITEA_URL}`)"
-      - "traefik.http.routers.gitea-http.middlewares=gitea-https@docker"
-      - "traefik.http.routers.gitea.entrypoints=web-secure"
+      - "traefik.http.routers.gitea.entrypoints=websecure"
       - "traefik.http.routers.gitea.rule=Host(`${GITEA_URL}`)"
       - "traefik.http.routers.gitea.tls=true"
       - "traefik.http.routers.gitea.tls.certresolver=default"

guacamole/docker-compose.yaml

@@ -40,11 +40,7 @@ services:
       - guacamole_mysql
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.guacamole-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.guacamole-http.entrypoints=web"
-      - "traefik.http.routers.guacamole-http.rule=Host(`guacamole.example.com`)"  # Domain anpassen
-      - "traefik.http.routers.guacamole-http.middlewares=guacamole-https@docker"
-      - "traefik.http.routers.guacamole.entrypoints=web-secure"
+      - "traefik.http.routers.guacamole.entrypoints=websecure"
       - "traefik.http.routers.guacamole.rule=Host(`guacamole.example.com`)"  # Domain anpassen
       - "traefik.http.routers.guacamole.tls=true"
       - "traefik.http.routers.guacamole.tls.certresolver=default"

heimdall/docker-compose.yaml

@@ -17,11 +17,7 @@ services:
       - PUID=1000
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.heimdall-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.heimdall-http.entrypoints=web"
-      - "traefik.http.routers.heimdall-http.rule=Host(`heimdall.example.com`)"  # Domain anpassen
-      - "traefik.http.routers.heimdall-http.middlewares=heimdall-https@docker"
-      - "traefik.http.routers.heimdall.entrypoints=web-secure"
+      - "traefik.http.routers.heimdall.entrypoints=websecure"
       - "traefik.http.routers.heimdall.rule=Host(`heimdall.example.com`)"  # Domain anpassen
       - "traefik.http.routers.heimdall.tls=true"
       - "traefik.http.routers.heimdall.tls.certresolver=default"

ilias/docker-compose.yaml

@@ -40,11 +40,7 @@ services:
       - ILIAS_CLIENT_NAME=default
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.ilias-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.ilias-http.entrypoints=web"
-      - "traefik.http.routers.ilias-http.rule=Host(`${ILIAS_URL}`)"  # Domain anpassen
-      - "traefik.http.routers.ilias-http.middlewares=ilias-https@docker"
-      - "traefik.http.routers.ilias.entrypoints=web-secure"
+      - "traefik.http.routers.ilias.entrypoints=websecure"
       - "traefik.http.routers.ilias.rule=Host(`${ILIAS_URL}`)"  # Domain anpassen
       - "traefik.http.routers.ilias.tls=true"
       - "traefik.http.routers.ilias.tls.certresolver=default"

influxdb/docker-compose.yaml

@@ -7,6 +7,6 @@ services:
     container_name: influxdb
     restart: unless-stopped
     volumes:
-      - $PWD:/var/lib/influxdb
+      - /var/docker/influxdb:/var/lib/influxdb
     ports:
       - 8086:8086

matomo/docker-compse.yaml

@@ -36,11 +36,7 @@ services:
       - traefik_proxy
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.matomo-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.matomo-http.entrypoints=web"
-      - "traefik.http.routers.matomo-http.rule=Host(`${MATOMO_URL}`)"
-      - "traefik.http.routers.matomo-http.middlewares=matomo-https@docker"
-      - "traefik.http.routers.matomo.entrypoints=web-secure"
+      - "traefik.http.routers.matomo.entrypoints=websecure"
       - "traefik.http.routers.matomo.rule=Host(`${MATOMO_URL}`)"
       - "traefik.http.routers.matomo.tls=true"
       - "traefik.http.routers.matomo.tls.certresolver=default"

miniflux/docker-compose.yaml

@@ -15,11 +15,7 @@ services:
       - ADMIN_PASSWORD=${ADMIN_PASSWORD}
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.miniflux-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.miniflux-http.entrypoints=web"
-      - "traefik.http.routers.miniflux-http.rule=Host(`${EXTERNAL_URL}`)"
-      - "traefik.http.routers.miniflux-http.middlewares=miniflux-https@docker"
-      - "traefik.http.routers.miniflux.entrypoints=web-secure"
+      - "traefik.http.routers.miniflux.entrypoints=websecure"
       - "traefik.http.routers.miniflux.rule=Host(`${EXTERNAL_URL}`)"
       - "traefik.http.routers.miniflux.tls=true"
       - "traefik.http.routers.miniflux.tls.certresolver=default"

monitoring/docker-compose.yaml

@@ -58,11 +58,7 @@ services:
       - mon_prometheus
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.grafana-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.grafana-http.entrypoints=web"
-      - "traefik.http.routers.grafana-http.rule=Host(`grafana.example.com`)"  # Domain anpassen
-      - "traefik.http.routers.grafana-http.middlewares=grafana-https@docker"
-      - "traefik.http.routers.grafana.entrypoints=web-secure"
+      - "traefik.http.routers.grafana.entrypoints=websecure"
       - "traefik.http.routers.grafana.rule=Host(`grafana.example.com`)"  # Domain anpassen
       - "traefik.http.routers.grafana.tls=true"
       - "traefik.http.routers.grafana.tls.certresolver=default"

nextcloud/docker-compose.yaml

@@ -44,11 +44,7 @@ services:
       - nextcloud-db
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.nextcloud-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.nextcloud-http.entrypoints=web"
-      - "traefik.http.routers.nextcloud-http.rule=Host(`${NEXTCLOUD_URL}`)"
-      - "traefik.http.routers.nextcloud-http.middlewares=nextcloud-https@docker"
-      - "traefik.http.routers.nextcloud.entrypoints=web-secure"
+      - "traefik.http.routers.nextcloud.entrypoints=websecure"
       - "traefik.http.routers.nextcloud.rule=Host(`${NEXTCLOUD_URL}`)"
       - "traefik.http.routers.nextcloud.tls=true"
       - "traefik.http.routers.nextcloud.tls.certresolver=default"

nextcloud/docker-compose_rpi-nextcloud.yaml

@@ -12,7 +12,6 @@ services:
       - /var/docker/nextcloud/database_var:/var/lib/mysql
       - /var/docker/nextcloud/database_config:/config
     environment:
-      - TZ=Europe/Berlin
       - PUID=1000
       - PGID=1000
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
@@ -30,11 +29,7 @@ services:
       - nextcloud-db
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.nextcloud-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.nextcloud-http.entrypoints=web"
-      - "traefik.http.routers.nextcloud-http.rule=Host(`${NEXTCLOUD_URL}`)"
-      - "traefik.http.routers.nextcloud-http.middlewares=nextcloud-https@docker"
-      - "traefik.http.routers.nextcloud.entrypoints=web-secure"
+      - "traefik.http.routers.nextcloud.entrypoints=websecure"
       - "traefik.http.routers.nextcloud.rule=Host(`${NEXTCLOUD_URL}`)"
       - "traefik.http.routers.nextcloud.tls=true"
       - "traefik.http.routers.nextcloud.tls.certresolver=default"

phpipam/docker-compose.yaml

@@ -29,11 +29,7 @@ services:
       - phpipam-mysql
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.phpipam-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.phpipam-http.entrypoints=web"
-      - "traefik.http.routers.phpipam-http.rule=Host(`${PHPIPAM_URL}`)"
-      - "traefik.http.routers.phpipam-http.middlewares=phpipam-https@docker"
-      - "traefik.http.routers.phpipam.entrypoints=web-secure"
+      - "traefik.http.routers.phpipam.entrypoints=websecure"
       - "traefik.http.routers.phpipam.rule=Host(`${PHPIPAM_URL}`)"
       - "traefik.http.routers.phpipam.tls=true"
       - "traefik.http.routers.phpipam.tls.certresolver=default"

pi-hole/docker-compose.yaml

@@ -15,7 +15,7 @@ services:
       - '/var/docker/pi-hole/etc/dnsmasq.d/:/etc/dnsmasq.d/'
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.pi-hole.entrypoints=web-secure"
+      - "traefik.http.routers.pi-hole.entrypoints=websecure"
       - "traefik.http.routers.pi-hole.rule=Host(`host.example.com`) && PathPrefix(`/pi-hole`)"  # Domain anpassen
       - "traefik.http.routers.pi-hole.tls=true"
       - "traefik.http.routers.pi-hole.tls.certresolver=default"
@@ -25,7 +25,6 @@ services:
       - "traefik.http.middlewares.pi-hole-replacepathregex.replacepathregex.replacement=/admin/$$1"
       - "traefik.http.services.pi-hole.loadbalancer.server.port=80"
     environment:
-      TZ: 'Europe/Berlin'
       DNS1: '192.168.0.1'  # IP des bisherigen DNS Server eintragen (z.B. der Router). Dieser wird von dnsmasq genutzt um Anfragen weiterzuleiten
       DNS2: 'no'
       ServerIP: '192.168.0.2'  # IP anpassen

plex/docker-compose.yaml

@@ -14,5 +14,4 @@ services:
       - /var/docker/plex/transcode:/transcode  # Den Pfad kannst du natürlich auch anpassen
       - <path>:/data  # Den Pfad bitte so setzen, dass Plex an eure Medien ran kommt
     environment:
-      - TZ=EUROPE/BERLIN
       - PLEX_CLAIM=<token>  # Den Token hier einfügen (siehe README)

portainer/docker-compose.yaml

@@ -12,11 +12,7 @@ services:
       - /var/docker/portainer:/data
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.portainer-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.portainer-http.entrypoints=web"
-      - "traefik.http.routers.portainer-http.rule=Host(`${PORTAINER_URL}`)"
-      - "traefik.http.routers.portainer-http.middlewares=portainer-https@docker"
-      - "traefik.http.routers.portainer.entrypoints=web-secure"
+      - "traefik.http.routers.portainer.entrypoints=websecure"
       - "traefik.http.routers.portainer.rule=Host(`${PORTAINER_URL}`)"
       - "traefik.http.routers.portainer.tls=true"
       - "traefik.http.routers.portainer.tls.certresolver=default"

recipes/docker-compose.yaml

@@ -44,11 +44,7 @@ services:
       - ./mediafiles:/media
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.recipes-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.recipes-http.entrypoints=web"
-      - "traefik.http.routers.recipes-http.rule=Host(`${RECIPES_URL}`)"
-      - "traefik.http.routers.recipes-http.middlewares=recipes-https@docker"
-      - "traefik.http.routers.recipes.entrypoints=web-secure"
+      - "traefik.http.routers.recipes.entrypoints=websecure"
       - "traefik.http.routers.recipes.rule=Host(`${RECIPES_URL}`)"
       - "traefik.http.routers.recipes.tls=true"
       - "traefik.http.routers.recipes.tls.certresolver=default"

redmine/docker-compose.yaml

@@ -22,11 +22,7 @@ services:
       - /var/docker/redmine/app:/usr/src/redmine/files
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.redmine-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.redmine-http.entrypoints=web"
-      - "traefik.http.routers.redmine-http.rule=Host(`redmine.example.com`)"  # Domain anpassen
-      - "traefik.http.routers.redmine-http.middlewares=redmine-https@docker"
-      - "traefik.http.routers.redmine.entrypoints=web-secure"
+      - "traefik.http.routers.redmine.entrypoints=websecure"
       - "traefik.http.routers.redmine.rule=Host(`redmine.example.com`)"  # Domain anpassen
       - "traefik.http.routers.redmine.tls=true"
       - "traefik.http.routers.redmine.tls.certresolver=default"

statping/docker-compose.yml

@@ -14,11 +14,7 @@ services:
       DB_CONN: sqlite
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.statping-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.statping-http.entrypoints=web"
-      - "traefik.http.routers.statping-http.rule=Host(`${EXTERNAL_URL}`)"
-      - "traefik.http.routers.statping-http.middlewares=statping-https@docker"
-      - "traefik.http.routers.statping.entrypoints=web-secure"
+      - "traefik.http.routers.statping.entrypoints=websecure"
       - "traefik.http.routers.statping.rule=Host(`${EXTERNAL_URL}`)"
       - "traefik.http.routers.statping.tls=true"
       - "traefik.http.routers.statping.tls.certresolver=default"

tautulli/docker-compose.yaml

@@ -13,14 +13,9 @@ services:
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=Europe/London
     labels:
       - "traefik.enable=true"
-      - "traefik.http.middlewares.tautulli-https.redirectscheme.scheme=https"
-      - "traefik.http.routers.tautulli-http.entrypoints=web"
-      - "traefik.http.routers.tautulli-http.rule=Host(`${TAUTULLI_URL}`)"
-      - "traefik.http.routers.tautulli-http.middlewares=tautulli-https@docker"
-      - "traefik.http.routers.tautulli.entrypoints=web-secure"
+      - "traefik.http.routers.tautulli.entrypoints=websecure"
       - "traefik.http.routers.tautulli.rule=Host(`${TAUTULLI_URL}`)"
       - "traefik.http.routers.tautulli.tls=true"
       - "traefik.http.routers.tautulli.tls.certresolver=default"

traefik/config/dynamic.yml

@@ -35,7 +35,7 @@ http:
 #   routers:
 #     router-1: # Tausche den Namen gegen etwas sprechendes aus
 #       entryPoints:
-#         - web-secure
+#         - websecure
 #       rule: "Host(`example.com`)"
 #       service: "service-1" # Den Namen am besten ähnlich zu dem oben setzen
 #       tls:

traefik/config/traefik.toml

@@ -12,11 +12,18 @@
 [api]
   dashboard = true
 
-[entryPoints]
-  [entryPoints.web]
-    address = ":80"
-  [entryPoints.web-secure]
-    address = ":443"
+# https://doc.traefik.io/traefik/routing/entrypoints/#redirection
+[entryPoints.web]
+  address = ":80"
+
+  [entryPoints.web.http]
+    [entryPoints.web.http.redirections]
+      [entryPoints.web.http.redirections.entryPoint]
+        to = "websecure"
+        scheme = "https"
+
+[entryPoints.websecure]
+  address = ":443"
 
 [certificatesResolvers]
   [certificatesResolvers.default.acme]

traefik/docker-compose.yaml

@@ -13,7 +13,7 @@ services:
     # labels:
     #  - "traefik.enable=true"
     #  - "traefik.http.routers.traefik.rule=Host(`traefik.example.com`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))"
-    #  - "traefik.http.routers.traefik.entrypoints=web-secure"
+    #  - "traefik.http.routers.traefik.entrypoints=websecure"
     #  - "traefik.http.routers.traefik.tls.certresolver=default"
     #  - "traefik.http.routers.traefik.service=api@internal"
     #  - "traefik.http.routers.traefik.middlewares=auth@docker"