removed diun, removed https redirect

handled by traefik
This commit is contained in:
2026-07-18 17:49:55 +02:00
parent fffe85df74
commit 0ede9ad64d
2 changed files with 3 additions and 34 deletions

View File

@@ -29,27 +29,16 @@ services:
### Section Træfik ### Section Træfik
- traefik.enable=${TRAEFIK_ENABLED} - traefik.enable=${TRAEFIK_ENABLED}
- traefik.docker.network=${TRAEFIK_NETWORK} - traefik.docker.network=${TRAEFIK_NETWORK}
## HTTP # HTTPS
- traefik.http.routers.http-${TRAEFIK_ROUTER}.entrypoints=http
# redirect to HTTPS only
- traefik.http.routers.http-${TRAEFIK_ROUTER}.middlewares=${TRAEFIK_HTTP_MIDDLEWARES}
- traefik.http.routers.http-${TRAEFIK_ROUTER}.rule=${TRAEFIK_MATCHRULE}
## HTTPS
- traefik.http.routers.https-${TRAEFIK_ROUTER}.entrypoints=https - traefik.http.routers.https-${TRAEFIK_ROUTER}.entrypoints=https
# configure the exposed service # configure the exposed service
- traefik.http.routers.https-${TRAEFIK_ROUTER}.middlewares=${TRAEFIK_HTTPS_MIDDLEWARES} - traefik.http.routers.https-${TRAEFIK_ROUTER}.middlewares=${TRAEFIK_MIDDLEWARES}
- traefik.http.routers.https-${TRAEFIK_ROUTER}.rule=${TRAEFIK_MATCHRULE} - traefik.http.routers.https-${TRAEFIK_ROUTER}.rule=${TRAEFIK_MATCHRULE}
# enable TLS and its certificate provider # enable TLS and its certificate provider
- traefik.http.routers.https-${TRAEFIK_ROUTER}.tls=${TRAEFIK_TLSENABLED} - traefik.http.routers.https-${TRAEFIK_ROUTER}.tls=${TRAEFIK_TLSENABLED}
- traefik.http.routers.https-${TRAEFIK_ROUTER}.tls.certresolver=${TRAEFIK_CERTRESOLVER} - traefik.http.routers.https-${TRAEFIK_ROUTER}.tls.certresolver=${TRAEFIK_CERTRESOLVER}
# specify a service so a custom port can be used # specify a service so a custom port can be used
- traefik.http.services.${TRAEFIK_SERVICE}.loadbalancer.server.port=${TRAEFIK_SERVICE_PORT} - traefik.http.services.${TRAEFIK_SERVICE}.loadbalancer.server.port=${TRAEFIK_SERVICE_PORT}
### Section Diun
- diun.enable=${BOOKSTACK_DIUN_ENABLE}
- diun.watch_repo=${BOOKSTACK_DIUN_WATCHREPO}
- diun.sort_tags=${BOOKSTACK_DIUN_SORTALGO}
- diun.include_tags=${BOOKSTACK_DIUN_INCLUDE}
- diun.exclude_tags=${BOOKSTACK_DIUN_EXCLUDE}
networks: networks:
- internal - internal
- traefik - traefik
@@ -64,13 +53,6 @@ services:
- MARIADB_DATABASE=${MARIADB_DATABASE} - MARIADB_DATABASE=${MARIADB_DATABASE}
- MARIADB_PASSWORD=${MARIADB_PASSWORD} - MARIADB_PASSWORD=${MARIADB_PASSWORD}
- MARIADB_USER=${MARIADB_USER} - MARIADB_USER=${MARIADB_USER}
labels:
### Section Diun
- diun.enable=${MARIADB_DIUN_ENABLE}
- diun.watch_repo=${MARIADB_DIUN_WATCHREPO}
- diun.sort_tags=${MARIADB_DIUN_SORTALGO}
- diun.include_tags=${MARIADB_DIUN_INCLUDE}
- diun.exclude_tags=${MARIADB_DIUN_EXCLUDE}
networks: networks:
- internal - internal
volumes: volumes:

View File

@@ -10,8 +10,7 @@ TRAEFIK_SERVICE_PORT=80
TRAEFIK_MATCHRULE=Host(`bookstack.example.com`) TRAEFIK_MATCHRULE=Host(`bookstack.example.com`)
TRAEFIK_TLSENABLED=true TRAEFIK_TLSENABLED=true
TRAEFIK_CERTRESOLVER=letsencrypt TRAEFIK_CERTRESOLVER=letsencrypt
TRAEFIK_HTTP_MIDDLEWARES=http-to-https TRAEFIK_MIDDLEWARES=hsts
TRAEFIK_HTTPS_MIDDLEWARES=hsts
# Bookstack # Bookstack
BOOKSTACK_VERSION=23.02.2 BOOKSTACK_VERSION=23.02.2
@@ -25,12 +24,6 @@ BOOKSTACK_MAIL_FROM=bookstack@example.com
BOOKSTACK_MAIL_FROM_NAME=Bookstack BOOKSTACK_MAIL_FROM_NAME=Bookstack
BOOKSTACK_MAIL_USERNAME=bookstack@example.com BOOKSTACK_MAIL_USERNAME=bookstack@example.com
BOOKSTACK_MAIL_PASSWORD=Em41lP4ssw0rd BOOKSTACK_MAIL_PASSWORD=Em41lP4ssw0rd
# Bookstack Diun
BOOKSTACK_DIUN_ENABLE=true
BOOKSTACK_DIUN_WATCHREPO=true
BOOKSTACK_DIUN_SORTALGO=semver
BOOKSTACK_DIUN_INCLUDE=
BOOKSTACK_DIUN_EXCLUDE=
# MariaDB # MariaDB
MARIADB_VERSION=10.11.2 MARIADB_VERSION=10.11.2
@@ -39,9 +32,3 @@ MARIADB_ROOT_PASSWORD=Sup3rS3cr3tP4ssw0rd
MARIADB_DATABASE=bookstack MARIADB_DATABASE=bookstack
MARIADB_PASSWORD=S3cr3tB00st4ckP4ssw0rd MARIADB_PASSWORD=S3cr3tB00st4ckP4ssw0rd
MARIADB_USER=bookstack MARIADB_USER=bookstack
# MariaDB Diun
MARIADB_DIUN_ENABLE=true
MARIADB_DIUN_WATCHREPO=true
MARIADB_DIUN_SORTALGO=semver
MARIADB_DIUN_INCLUDE=
MARIADB_DIUN_EXCLUDE=