diff --git a/docker-compose.yml b/docker-compose.yml index a85654e..23a3ce2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,27 +29,16 @@ services: ### Section Træfik - traefik.enable=${TRAEFIK_ENABLED} - traefik.docker.network=${TRAEFIK_NETWORK} - ## HTTP - - 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 + # HTTPS - traefik.http.routers.https-${TRAEFIK_ROUTER}.entrypoints=https # 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} # enable TLS and its certificate provider - traefik.http.routers.https-${TRAEFIK_ROUTER}.tls=${TRAEFIK_TLSENABLED} - traefik.http.routers.https-${TRAEFIK_ROUTER}.tls.certresolver=${TRAEFIK_CERTRESOLVER} # specify a service so a custom port can be used - 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: - internal - traefik @@ -64,13 +53,6 @@ services: - MARIADB_DATABASE=${MARIADB_DATABASE} - MARIADB_PASSWORD=${MARIADB_PASSWORD} - 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: - internal volumes: diff --git a/env.example b/env.example index 8da329d..6fcfe54 100644 --- a/env.example +++ b/env.example @@ -10,8 +10,7 @@ TRAEFIK_SERVICE_PORT=80 TRAEFIK_MATCHRULE=Host(`bookstack.example.com`) TRAEFIK_TLSENABLED=true TRAEFIK_CERTRESOLVER=letsencrypt -TRAEFIK_HTTP_MIDDLEWARES=http-to-https -TRAEFIK_HTTPS_MIDDLEWARES=hsts +TRAEFIK_MIDDLEWARES=hsts # Bookstack BOOKSTACK_VERSION=23.02.2 @@ -25,12 +24,6 @@ BOOKSTACK_MAIL_FROM=bookstack@example.com BOOKSTACK_MAIL_FROM_NAME=Bookstack BOOKSTACK_MAIL_USERNAME=bookstack@example.com 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_VERSION=10.11.2 @@ -39,9 +32,3 @@ MARIADB_ROOT_PASSWORD=Sup3rS3cr3tP4ssw0rd MARIADB_DATABASE=bookstack MARIADB_PASSWORD=S3cr3tB00st4ckP4ssw0rd MARIADB_USER=bookstack -# MariaDB Diun -MARIADB_DIUN_ENABLE=true -MARIADB_DIUN_WATCHREPO=true -MARIADB_DIUN_SORTALGO=semver -MARIADB_DIUN_INCLUDE= -MARIADB_DIUN_EXCLUDE=