feat(SignaturePDF): Add Traefik redirection

directus/docker-compose.yml

@@ -18,8 +18,6 @@ services:
       KEY: ${DIRECTUS_KEY:?err}
       SECRET: ${DIRECTUS_SECRET:?err}
       TELEMETRY: false
-      ACCEPT_TERMS: ${DIRECTUS_ACCEPT_TERMS:-true}
-      PROJECT_OWNER: ${DIRECTUS_PROJECT_OWNER:?err}
 
       ADMIN_EMAIL: ${DIRECTUS_ADMIN_EMAIL:?err}
       ADMIN_PASSWORD: ${DIRECTUS_ADMIN_PASSWORD:?err}

lldap/.env

@@ -8,7 +8,7 @@ COMPOSE_FILE=${SERVICES_DIR}/lldap/docker-compose.yml:${SERVICES_DIR}/lldap/dock
 #######
 # LLDAP
 
-SERVICE_DOMAIN=lldap.cool.life
+LLDAP_DOMAIN=lldap.cool.life
 LLDAP_VOLUME_NAME=lldap_cool_life
 LLDAP_CONTAINER_NAME=lldap_cool_life
 LLDAP_IMAGE=nitnelave/lldap:v0.4.3

lldap/docker-compose.traefik.yml

@@ -10,13 +10,13 @@ services:
     labels:
       - traefik.enable=true
       - traefik.docker.network=${TRAEFIK_NETWORK_NAME:-traefik}
-      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-lldap}.rule=Host(`${SERVICE_DOMAIN:?err}`)
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-lldap}.rule=Host(`${LLDAP_DOMAIN:?err}`)
       - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-lldap}.entrypoints=${TRAEFIK_ENTRYPOINTS:-web}
       # - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-lldap}.tls.certResolver=letsencrypt
       - traefik.http.services.${TRAEFIK_ROUTER_NAME:-lldap}.loadbalancer.server.port=17170
       - traefik.http.services.${TRAEFIK_ROUTER_NAME:-lldap}.loadbalancer.server.scheme=http
 
       # https://github.com/lldap/lldap/issues/247#issuecomment-1489962511
-      # - traefik.tcp.routers.${TRAEFIK_ROUTER_NAME:-lldap}.rule=HostSNI(`${SERVICE_DOMAIN:?err}`)
+      # - traefik.tcp.routers.${TRAEFIK_ROUTER_NAME:-lldap}.rule=HostSNI(`${LLDAP_DOMAIN:?err}`)
       # - traefik.tcp.routers.${TRAEFIK_ROUTER_NAME:-lldap}.entrypoints=${TRAEFIK_ENTRYPOINTS:-web}
       # - traefik.tcp.services.${TRAEFIK_ROUTER_NAME:-lldap}.loadbalancer.server.port=3890

lldap/docker-compose.yml

@@ -16,7 +16,7 @@ services:
       - LLDAP_VERBOSE=${LLDAP_VERBOSE:-false}
 
       - LLDAP_JWT_SECRET=${LLDAP_JWT_SECRET:?err}
-      - LLDAP_HTTP_URL=https://${SERVICE_DOMAIN:?err}
+      - LLDAP_HTTP_URL=https://${LLDAP_DOMAIN:?err}
 
       - LLDAP_LDAP_BASE_DN=${LLDAP_LDAP_BASE_DN:?err}
       - LLDAP_LDAP_USER_DN=${LLDAP_LDAP_USER_DN:?err}

mariadb/.env

@@ -1,18 +0,0 @@
-########
-# DOCKER
-
-#DOCKER_CONTEXT=
-#DOCKER_HOST=
-SERVICES_DIR=..
-COMPOSE_FILE=${SERVICES_DIR}/mariadb/docker-compose.yml:${SERVICES_DIR}/mariadb/docker-compose.local.yml
-#COMPOSE_PROJECT_NAME=
-
-## MARIADB
-
-#MARIADB_VOLUME_NAME=
-#MARIADB_CONTAINER_NAME=
-#MARIADB_IMAGE=
-MARIADB_ROOT_PASSWORD=password-example
-MARIADB_PASSWORD=password-example
-MARIADB_DATABASE=db
-MARIADB_USER=user

mariadb/README.md

@@ -1,15 +0,0 @@
-# Mariadb
-
-> Mariadb est une base de données SQL.
-
-## Liens
-
-- [Site Officiel][site]
-- [Documentation][documentation]
-- [Code source][source]
-- [Docker Hub][dockerhub]
-
-[site]: https://mariadb.org/
-[source]: https://github.com/MariaDB/
-[documentation]: https://mariadb.org/documentation/
-[dockerhub]: https://hub.docker.com/_/mariadb/

mariadb/docker-compose.local.yml

@@ -1,6 +0,0 @@
----
-
-services:
-  mariadb:
-    ports:
-      - ${LOCAL_PORT:-3306}:3306

mariadb/docker-compose.yml

@@ -1,20 +0,0 @@
----
-
-services:
-  mariadb:
-    container_name: ${MARIADB_CONTAINER_NAME:-mariadb}
-    image: ${MARIADB_IMAGE:-mariadb:lts}
-    restart: always
-    volumes:
-      - mariadb:/var/lib/mysql
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-    environment:
-      - MARIADB_DATABASE=${MARIADB_DATABASE:?err}
-      - MARIADB_PASSWORD=${MARIADB_PASSWORD:?err}
-      - MARIADB_ROOT_PASSWORD=${MARIADB_ROOT_PASSWORD:?err}
-      - MARIADB_USER=${MARIADB_USER:?err}
-
-volumes:
-  mariadb:
-    name: ${MARIADB_VOLUME_NAME:-mariadb}

matomo/.env

@@ -1,32 +0,0 @@
-########
-# DOCKER
-
-#DOCKER_CONTEXT=
-#DOCKER_HOST=
-SERVICES_DIR=..
-COMPOSE_FILE=${SERVICES_DIR}/mariadb/docker-compose.yml:${SERVICES_DIR}/matomo/docker-compose.mariadb.yml:${SERVICES_DIR}/matomo/docker-compose.yml:${SERVICES_DIR}/matomo/docker-compose.local.yml
-#COMPOSE_PROJECT_NAME=
-
-## APP
-
-MATOMO_DOMAIN=localhost
-#MATOMO_CONTAINER_NAME=matomo
-#MATOMO_VOLUME_NAME=matomo
-#MATOMO_IMAGE=matomo:4.1.1-apache
-#MATOMO_DATABASE_TABLES_PREFIX:matomo_
-
-## MARIADB
-
-#MARIADB_VOLUME_NAME=
-#MARIADB_CONTAINER_NAME=
-#MARIADB_IMAGE=
-MARIADB_ROOT_PASSWORD=password-example
-MARIADB_PASSWORD=password-example
-MARIADB_DATABASE=matomo
-MARIADB_USER=matomo
-
-## TRAEFIK
-
-#TRAEFIK_NETWORK_NAME=
-#TRAEFIK_ROUTER_NAME=
-#TRAEFIK_ENTRYPOINTS=

matomo/README.md

@@ -1,15 +0,0 @@
-# Matomo
-
-> Matomo est une plateforme d'analyse Web complète et open source.
-
-## Liens
-
-- [Site Officiel][site]
-- [Documentation][documentation]
-- [Code source][source]
-- [Docker Hub][dockerhub]
-
-[site]: https://matomo.org/
-[source]: https://github.com/matomo-org/matomo
-[documentation]: https://matomo.org/faq/reports/tour-of-matomo-overview-of-the-reporting-interface/
-[dockerhub]: https://hub.docker.com/_/matomo/

matomo/docker-compose.local.yml

@@ -1,6 +0,0 @@
----
-
-services:
-  matomo:
-    ports:
-      - ${LOCAL_PORT:-8080}:80

matomo/docker-compose.mariadb.yml

@@ -1,9 +0,0 @@
----
-
-services:
-  mariadb:
-    command: --max-allowed-packet=64MB
-    environment:
-      - MARIADB_AUTO_UPGRADE=1
-      - MARIADB_DISABLE_UPGRADE_BACKUP=1
-      - MARIADB_INITDB_SKIP_TZINFO=1

matomo/docker-compose.traefik.yml

@@ -1,14 +0,0 @@
----
-
-networks:
-  default:
-    name: ${TRAEFIK_NETWORK_NAME:-traefik}
-    external: true
-
-services:
-  matomo:
-    labels:
-      - traefik.enable=true
-      - traefik.docker.network=${TRAEFIK_NETWORK_NAME:-traefik}
-      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-matomo}.rule=Host(`${SERVICE_DOMAIN:?err}`)
-      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-matomo}.entrypoints=${TRAEFIK_ENTRYPOINTS:-web}

matomo/docker-compose.yml

@@ -1,26 +0,0 @@
----
-
-services:
-  matomo:
-    container_name: ${MATOMO_CONTAINER_NAME:-matomo}
-    image: ${MATOMO_IMAGE:-matomo:4.1.1-apache}
-    restart: always
-    volumes:
-#     - ./config:/var/www/html/config:z
-#     - ./logs:/var/www/html/logs:z
-      - matomo:/var/www/html
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-    depends_on:
-      - mariadb
-    environment:
-      - MATOMO_DATABASE_ADAPTER=mysql
-      - MATOMO_DATABASE_DBNAME=${MARIADB_DATABASE:?err}
-      - MATOMO_DATABASE_HOST=mariadb
-      - MATOMO_DATABASE_PASSWORD=${MARIADB_PASSWORD:?err}
-      - MATOMO_DATABASE_TABLES_PREFIX=${MATOMO_DATABASE_TABLES_PREFIX:-matomo_}
-      - MATOMO_DATABASE_USERNAME=${MARIADB_USER:?err}
-
-volumes:
-  matomo:
-    name: ${MATOMO_VOLUME_NAME:-matomo}

vaultwarden/.env

@@ -9,7 +9,7 @@ COMPOSE_FILE=${SERVICES_DIR}/vaultwarden/docker-compose.yml
 
 #VAULTWARDEN_IMAGE=
 #VAULTWARDEN_VOLUME_NAME=
-SERVICE_DOMAIN=vaultwarden.local
+VAULTWARDEN_DOMAIN=vaultwarden.local
 
 #VAULTWARDEN_LOG_LEVEL=
 #VAULTWARDEN_SIGNUPS_ALLOWED=false

vaultwarden/README.md

@@ -10,20 +10,6 @@ Toutes les variables de configuration du service sont disponibles à [cette adre
 
 [Les clients de Bitwarden](https://bitwarden.com/#download) sont compatibles avec le serveur.
 
-## Ajout des mails en Français
-
-Il est possible de [traduire les mails](https://github.com/dani-garcia/vaultwarden/wiki/Translating-the-email-templates).
-
-```
-. .env
-cd /var/lib/docker/volumes/${VAULTWARDEN_VOLUME_NAME}/_data/
-mkdir templates && cd templates
-wget https://github.com/YoanSimco/vaultwarden-lang-fr/archive/refs/heads/main.zip
-unzip main.zip
-mv vaultwarden-lang-fr/email .
-rm vaultwarden-lang-fr-main/ main.zip -rf
-```
-
 ## Liens
 
 - [Documentation][documentation]

vaultwarden/docker-compose.sso.yml

@@ -1,25 +0,0 @@
----
-
-services:
-  vaultwarden:
-    environment:
-      SSO_ENABLED: ${SSO_ENABLED:-true}
-      SSO_ONLY: ${SSO_ONLY:-true}
-      SSO_SIGNUPS_MATCH_EMAIL: ${SSO_SIGNUPS_MATCH_EMAIL:-true}
-      SSO_AUTHORITY: ${SSO_AUTHORITY}
-      SSO_SCOPES: ${SSO_SCOPES:-email groups profile offline_access}
-      SSO_AUTHORIZE_EXTRA_PARAMS: ${SSO_AUTHORIZE_EXTRA_PARAMS:-}
-      SSO_PKCE: ${SSO_PKCE:-false}
-      SSO_CLIENT_ID: ${SSO_CLIENT_ID}
-      SSO_CLIENT_SECRET: ${SSO_CLIENT_SECRET}
-      # SSO_MASTER_PASSWORD_POLICY: ${SSO_MASTER_PASSWORD_POLICY:-}
-      SSO_AUTH_ONLY_NOT_SESSION: ${SSO_AUTH_ONLY_NOT_SESSION:-false}
-      SSO_CLIENT_CACHE_EXPIRATION: ${SSO_CLIENT_CACHE_EXPIRATION:-0}
-      SSO_DEBUG_TOKENS: ${SSO_DEBUG_TOKENS:-false}
-
-      SSO_FRONTEND: ${SSO_FRONTEND:-override}
-      # SSO_EXPERIMENTAL_NO_MASTER_PWD: ${SSO_EXPERIMENTAL_NO_MASTER_PWD:-false}
-      SSO_ROLES_ENABLED: ${SSO_ROLES_ENABLED:-false}
-      SSO_ROLES_DEFAULT_TO_USER: ${SSO_ROLES_DEFAULT_TO_USER:-false}
-
-      SSO_ORGANIZATIONS_INVITE: ${SSO_ORGANIZATIONS_INVITE:-false}

vaultwarden/docker-compose.traefik.https.yml

@@ -1,12 +0,0 @@
----
-
-services:
-  vaultwarden:
-    labels:
-      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-vaultwarden}.tls.certResolver=letsencrypt
-      # redirect HTTP to HTTPS
-      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-vaultwarden}_http.rule=Host(`${SERVICE_DOMAIN:?err}`)
-      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-vaultwarden}_http.entrypoints=web
-      - traefik.http.middlewares.${TRAEFIK_ROUTER_NAME:-vaultwarden}_redirect_https.redirectscheme.scheme=https
-      - traefik.http.middlewares.${TRAEFIK_ROUTER_NAME:-vaultwarden}_redirect_https.redirectscheme.permanent=true
-      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-vaultwarden}_http.middlewares=${TRAEFIK_ROUTER_NAME:-vaultwarden}_redirect_https

vaultwarden/docker-compose.traefik.yml

@@ -10,5 +10,5 @@ services:
     labels:
       - traefik.enable=true
       - traefik.docker.network=${TRAEFIK_NETWORK_NAME:-traefik}
-      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-vaultwarden}.rule=Host(`${SERVICE_DOMAIN:?err}`)
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-vaultwarden}.rule=Host(`${VAULTWARDEN_DOMAIN:?err}`)
       - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-vaultwarden}.entrypoints=${TRAEFIK_ENTRYPOINTS:-web}

vaultwarden/docker-compose.yml

@@ -6,21 +6,15 @@ volumes:
 
 services:
   vaultwarden:
-    image:  ${VAULTWARDEN_IMAGE:-vaultwarden/server:1.34.1-alpine}
+    image:  ${VAULTWARDEN_IMAGE:-vaultwarden/server:1.27.0-alpine}
     container_name: ${VAULTWARDEN_CONTAINER_NAME:-vaultwarden}
     restart: always
     environment:
       ADMIN_TOKEN: ${VAULTWARDEN_ADMIN_TOKEN:?err}
-      DOMAIN: https://${SERVICE_DOMAIN:?err}
+      DOMAIN: https://${VAULTWARDEN_DOMAIN:?err}
-      SENDS_ALLOWED: ${SENDS_ALLOWED:-true}
-      TRASH_AUTO_DELETE_DAYS: ${TRASH_AUTO_DELETE_DAYS:-}
-      DISABLE_ICON_DOWNLOAD: ${DISABLE_ICON_DOWNLOAD:-false}
-      SIGNUPS_ALLOWED: ${VAULTWARDEN_SIGNUPS_ALLOWED:-true}
-      SIGNUPS_VERIFY: ${SIGNUPS_VERIFY:-false}
-      SIGNUPS_DOMAINS_WHITELIST: ${SIGNUPS_DOMAINS_WHITELIST:-}
       INVITATION_ORG_NAME: ${VAULTWARDEN_INVITATION_ORG_NAME:-Vaultwarden}
       LOG_LEVEL: ${VAULTWARDEN_LOG_LEVEL:-Info}
-      ORG_GROUPS_ENABLED: ${VAULTWARDEN_ORG_GROUPS_ENABLED:-false}
+      SIGNUPS_ALLOWED: ${VAULTWARDEN_SIGNUPS_ALLOWED:-true}
     volumes:
       - vaultwarden:/data
       - /etc/timezone:/etc/timezone:ro