@@ -49,11 +49,12 @@ services:
4949 - " traefik.http.routers.wsc-https.entrypoints=websecure"
5050 - " traefik.http.routers.wsc-https.service=wsc"
5151 # load middlewares for routes
52- - " traefik.http.routers.wsc-http.middlewares=wsc-https@docker"
52+ # - "traefik.http.routers.wsc-http.middlewares=wsc-https@docker"
53+ - " traefik.http.routers.wsc-http.middlewares=redirect-to-https@file"
5354 # - "traefik.http.routers.wsc-https.middlewares="
5455 # http to https redirect
55- - " traefik.http.middlewares.wsc-https.redirectscheme.scheme=https"
56- - " traefik.http.middlewares.wsc-https.redirectscheme.permanent=true"
56+ # - "traefik.http.middlewares.wsc-https.redirectscheme.scheme=https"
57+ # - "traefik.http.middlewares.wsc-https.redirectscheme.permanent=true"
5758 # - "traefik.http.middlewares.wsc-https.redirectscheme.port=443"
5859
5960 # https://hub.docker.com/_/mariadb
@@ -81,20 +82,20 @@ services:
8182 # EXPORTER_MAXUSERCONNECTIONS: "3"
8283 # ports:
8384 # - 127.0.0.1:3306:3306/tcp
84- healthcheck :
85- test : mariadb-admin ping -h 127.0.0.1 -u root --password=$$MARIADB_ROOT_PASSWORD || exit 1
86- # test: mariadb-admin ping -h 127.0.0.1 -u $$MARIADB_USER --password=$$MARIADB_PASSWORD || exit 1
87- # start_period: 10s
88- interval : 30s
89- timeout : 5s
90- retries : 3
9185 networks :
9286 wsc-net :
9387 aliases :
9488 - wsc-database
9589 - wsc-mysql
9690 - wsc-mariadb
97- # check with: "docker inspect --format='{{json .State.Health}}' wsc-db | jq"
91+ healthcheck :
92+ test : mariadb-admin ping -h localhost -u root --password=$$MARIADB_ROOT_PASSWORD || exit 1
93+ # test: mariadb-admin ping -h localhost -u $$MARIADB_USER --password=$$MARIADB_PASSWORD || exit 1
94+ # start_period: 10s
95+ interval : 30s
96+ timeout : 5s
97+ retries : 3
98+ # check with: "docker inspect --format='{{json .State.Health}}' wsc-db | jq"
9899
99100# # https://github.com/prometheus/mysqld_exporter
100101# wsc-db-exporter:
@@ -232,11 +233,12 @@ services:
232233 - " traefik.http.routers.traefik-https.entrypoints=websecure"
233234 - " traefik.http.routers.traefik-https.service=api@internal"
234235 # load middlewares for routes
235- - " traefik.http.routers.traefik-http.middlewares=traefik-https@docker,traefik-auth@docker"
236+ # - "traefik.http.routers.traefik-http.middlewares=traefik-https@docker,traefik-auth@docker"
237+ - " traefik.http.routers.traefik-http.middlewares=redirect-to-https@file,traefik-auth@docker"
236238 - " traefik.http.routers.traefik-https.middlewares=traefik-auth@docker"
237239 # Middleware: http to https redirect
238- - " traefik.http.middlewares.traefik-https.redirectscheme.scheme=https"
239- - " traefik.http.middlewares.traefik-https.redirectscheme.permanent=true"
240+ # - "traefik.http.middlewares.traefik-https.redirectscheme.scheme=https"
241+ # - "traefik.http.middlewares.traefik-https.redirectscheme.permanent=true"
240242 # - "traefik.http.middlewares.traefik-https.redirectscheme.port=443"
241243 # Middleware: auth
242244 # basic auth with htpasswd (You may need to escape any $ with another $ in password. create password: "docker run --rm tobi312/tools:htpasswd -bn admin 'passw0rd' | sed 's/\$/\$\$/g'" OR only for Password: "openssl passwd -apr1 'passw0rd' | sed 's/\$/\$\$/g'")
0 commit comments