feat(Vaultwarden): Add new org groups feature

feat(LLDAP): Utilisation de la nouvelle variable plus généric
Merge pull request 'feat(Vaultwarden): Change domain variable' (#82 ) from vaultwarden_domain into main
2025-06-11 22:03:42 +02:00 · 2024-10-17 14:13:47 +02:00 · 2024-10-01 10:51:14 +02:00 · 2024-10-01 10:49:32 +02:00 · 2024-08-02 16:52:54 +02:00 · 2024-08-02 16:52:33 +02:00
86 changed files with 111 additions and 143 deletions
--- a/clickhouse/docker-compose.yml
+++ b/clickhouse/docker-compose.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 volumes:
  clickhouse:
--- a/directus/docker-compose.redis.yml
+++ b/directus/docker-compose.redis.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  directus:
    environment:
--- a/directus/docker-compose.smtp.yml
+++ b/directus/docker-compose.smtp.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  directus:
    environment:
--- a/directus/docker-compose.traefik.yml
+++ b/directus/docker-compose.traefik.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 networks:
  default:
    name: ${TRAEFIK_NETWORK_NAME:-traefik}
--- a/directus/docker-compose.yml
+++ b/directus/docker-compose.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 volumes:
  directus:
    name: ${DIRECTUS_VOLUME_NAME:-directus}
--- a/drone/runner/docker-compose.dashboard.yml
+++ b/drone/runner/docker-compose.dashboard.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 # https://docs.drone.io/runner/docker/configuration/dashboard/

 services:
--- a/drone/runner/docker-compose.local.yml
+++ b/drone/runner/docker-compose.local.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  drone-runner:
    ports:
--- a/drone/runner/docker-compose.logging.yml
+++ b/drone/runner/docker-compose.logging.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 # https://docs.drone.io/runner/docker/configuration/logging/

 services:
--- a/drone/runner/docker-compose.traefik.yml
+++ b/drone/runner/docker-compose.traefik.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 networks:
  default:
    name: ${TRAEFIK_NETWORK_NAME}
--- a/drone/runner/docker-compose.yml
+++ b/drone/runner/docker-compose.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 # https://docs.drone.io/runner/docker/installation/linux/

 services:
--- a/drone/server/docker-compose.cookie.yml
+++ b/drone/server/docker-compose.cookie.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 # https://docs.drone.io/server/cookie/

 services:
--- a/drone/server/docker-compose.gitea.yml
+++ b/drone/server/docker-compose.gitea.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 # https://docs.drone.io/server/provider/gitea/

 services:
--- a/drone/server/docker-compose.header.yml
+++ b/drone/server/docker-compose.header.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 # https://docs.drone.io/server/headers/

 services:
--- a/drone/server/docker-compose.local.yml
+++ b/drone/server/docker-compose.local.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  drone-server:
    ports:
--- a/drone/server/docker-compose.logging.yml
+++ b/drone/server/docker-compose.logging.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 # https://docs.drone.io/server/logging/

 services:
--- a/drone/server/docker-compose.postgres.yml
+++ b/drone/server/docker-compose.postgres.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 # https://docs.drone.io/server/storage/database/
 # https://docs.drone.io/server/storage/encryption/

--- a/drone/server/docker-compose.traefik.yml
+++ b/drone/server/docker-compose.traefik.yml
@ -1,10 +1,9 @@
 ---

-version: "3.8"
-
 networks:
  default:
    name: ${TRAEFIK_NETWORK_NAME}
+    external: true

 services:
  drone-server:
--- a/drone/server/docker-compose.user.yml
+++ b/drone/server/docker-compose.user.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 # https://docs.drone.io/server/user/registration/

 services:
--- a/drone/server/docker-compose.yml
+++ b/drone/server/docker-compose.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 volumes:
  drone-server:
    name: ${DRONE_SERVER_VOLUME_NAME:-drone-server}
--- a/geoip/docker-compose.yml
+++ b/geoip/docker-compose.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 volumes:
  geoip:
    name: ${GEOIP_VOLUME_NAME:-geoip}
--- a/geoipupdate/docker-compose.yml
+++ b/geoipupdate/docker-compose.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 volumes:
  geoipupdate:
    name: ${GEOIPUPDATE_VOLUME_NAME:-geoipupdate}
--- a/gitea/docker-compose.metrics.yml
+++ b/gitea/docker-compose.metrics.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  gitea:
    environment:
--- a/gitea/docker-compose.override.yml
+++ b/gitea/docker-compose.override.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  gitea:
    ports:
--- a/gitea/docker-compose.postgres.yml
+++ b/gitea/docker-compose.postgres.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  gitea:
    environment:
--- a/gitea/docker-compose.smtp.yml
+++ b/gitea/docker-compose.smtp.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  gitea:
    environment:
--- a/gitea/docker-compose.traefik.yml
+++ b/gitea/docker-compose.traefik.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 networks:
  default:
    name: ${TRAEFIK_NETWORK_NAME:-traefik}
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 volumes:
  gitea:
    name: ${GITEA_VOLUME_NAME:-gitea}
--- a/grafana/docker-compose.postgres.yml
+++ b/grafana/docker-compose.postgres.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 services:
  grafana:
--- a/grafana/docker-compose.redis.yml
+++ b/grafana/docker-compose.redis.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 services:
  grafana:
--- a/grafana/docker-compose.smtp.yml
+++ b/grafana/docker-compose.smtp.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 services:
  grafana:
--- a/grafana/docker-compose.traefik.yml
+++ b/grafana/docker-compose.traefik.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 networks:
  default:
--- a/grafana/docker-compose.yml
+++ b/grafana/docker-compose.yml
@ -1,5 +1,4 @@
 ---
-version: "3.8"

 volumes:
  grafana:
--- a/hedgedoc/docker-compose.traefik.yml
+++ b/hedgedoc/docker-compose.traefik.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 networks:
  default:
--- a/hedgedoc/docker-compose.yml
+++ b/hedgedoc/docker-compose.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 volumes:
  hedgedoc:
--- a/listmonk/docker-compose.yml
+++ b/listmonk/docker-compose.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 networks:
  default:
--- a/lldap/.env
+++ b/lldap/.env
@ -8,7 +8,7 @@ COMPOSE_FILE=${SERVICES_DIR}/lldap/docker-compose.yml:${SERVICES_DIR}/lldap/dock
 #######
 # LLDAP

-LLDAP_DOMAIN=lldap.cool.life
+SERVICE_DOMAIN=lldap.cool.life
 LLDAP_VOLUME_NAME=lldap_cool_life
 LLDAP_CONTAINER_NAME=lldap_cool_life
 LLDAP_IMAGE=nitnelave/lldap:v0.4.3
--- a/lldap/docker-compose.local.yml
+++ b/lldap/docker-compose.local.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  lldap:
    ports:
--- a/lldap/docker-compose.postgres.yml
+++ b/lldap/docker-compose.postgres.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  lldap:
    environment:
--- a/lldap/docker-compose.smtp.yml
+++ b/lldap/docker-compose.smtp.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  lldap:
    environment:
--- a/lldap/docker-compose.traefik.yml
+++ b/lldap/docker-compose.traefik.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 networks:
  default:
    name: ${TRAEFIK_NETWORK_NAME:-traefik}
@ -12,13 +10,13 @@ services:
    labels:
      - traefik.enable=true
      - traefik.docker.network=${TRAEFIK_NETWORK_NAME:-traefik}
-      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-lldap}.rule=Host(`${LLDAP_DOMAIN:?err}`)
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-lldap}.rule=Host(`${SERVICE_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(`${LLDAP_DOMAIN:?err}`)
+      # - traefik.tcp.routers.${TRAEFIK_ROUTER_NAME:-lldap}.rule=HostSNI(`${SERVICE_DOMAIN:?err}`)
      # - traefik.tcp.routers.${TRAEFIK_ROUTER_NAME:-lldap}.entrypoints=${TRAEFIK_ENTRYPOINTS:-web}
      # - traefik.tcp.services.${TRAEFIK_ROUTER_NAME:-lldap}.loadbalancer.server.port=3890
--- a/lldap/docker-compose.yml
+++ b/lldap/docker-compose.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 volumes:
  lldap:
    name: ${LLDAP_VOLUME_NAME:-lldap}
@ -18,7 +16,7 @@ services:
      - LLDAP_VERBOSE=${LLDAP_VERBOSE:-false}

      - LLDAP_JWT_SECRET=${LLDAP_JWT_SECRET:?err}
-      - LLDAP_HTTP_URL=https://${LLDAP_DOMAIN:?err}
+      - LLDAP_HTTP_URL=https://${SERVICE_DOMAIN:?err}

      - LLDAP_LDAP_BASE_DN=${LLDAP_LDAP_BASE_DN:?err}
      - LLDAP_LDAP_USER_DN=${LLDAP_LDAP_USER_DN:?err}
--- a/mobilizon/docker-compose.local.yml
+++ b/mobilizon/docker-compose.local.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  mobilizon:
    ports:
--- a/mobilizon/docker-compose.traefik.yml
+++ b/mobilizon/docker-compose.traefik.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 networks:
  default:
    name: ${TRAEFIK_NETWORK_NAME:-traefik}
--- a/mobilizon/docker-compose.yml
+++ b/mobilizon/docker-compose.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 volumes:
  mobilizon:
    name: ${MOBILIZON_VOLUME_NAME:-mobilizon}
--- a/nextcloud/docker-compose.config.yml
+++ b/nextcloud/docker-compose.config.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  nextcloud-fpm:
    environment:
--- a/nextcloud/docker-compose.local.yml
+++ b/nextcloud/docker-compose.local.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  nextcloud-web:
    ports:
--- a/nextcloud/docker-compose.postgres.yml
+++ b/nextcloud/docker-compose.postgres.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  nextcloud-fpm:
    depends_on:
--- a/nextcloud/docker-compose.redis.yml
+++ b/nextcloud/docker-compose.redis.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  nextcloud-fpm:
    depends_on:
--- a/nextcloud/docker-compose.smtp.yml
+++ b/nextcloud/docker-compose.smtp.yml
@ -1,14 +1,12 @@
 ---

-version: "3.8"
-
 services:
  nextcloud-fpm:
    environment:
      &smtp-configuration
      SMTP_HOST: ${SMTP_HOST:?err}
-      SMTP_SECURE: ${SMTP_SECURE:-ssl}
-      SMTP_PORT: ${SMTP_PORT:-465}
+      SMTP_SECURE: ${SMTP_SECURE:-}
+      SMTP_PORT: ${SMTP_PORT:-587}
      SMTP_AUTHTYPE: ${SMTP_AUTHTYPE:-LOGIN}
      SMTP_NAME: ${SMTP_NAME:?err}
      SMTP_PASSWORD: ${SMTP_PASSWORD:?err}
--- a/nextcloud/docker-compose.traefik.yml
+++ b/nextcloud/docker-compose.traefik.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 networks:
  default:
    name: ${TRAEFIK_NETWORK_NAME:-traefik}
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 volumes:
  nextcloud:
    name: ${NEXTCLOUD_VOLUME_NAME:-nextcloud}
--- a/plausible/docker-compose.clickhouse.yml
+++ b/plausible/docker-compose.clickhouse.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 services:
  clickhouse:
--- a/plausible/docker-compose.geoip.yml
+++ b/plausible/docker-compose.geoip.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 services:
  plausible:
--- a/plausible/docker-compose.google.yml
+++ b/plausible/docker-compose.google.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 services:
  plausible:
--- a/plausible/docker-compose.local.yml
+++ b/plausible/docker-compose.local.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 services:
  plausible:
--- a/plausible/docker-compose.smtp.yml
+++ b/plausible/docker-compose.smtp.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 services:
  plausible:
--- a/plausible/docker-compose.traefik.yml
+++ b/plausible/docker-compose.traefik.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 networks:
  default:
--- a/plausible/docker-compose.yml
+++ b/plausible/docker-compose.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 volumes:
  plausible:
--- a/postgres/docker-compose.yml
+++ b/postgres/docker-compose.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 volumes:
  postgres:
--- a/prometheus/docker-compose.traefik.yml
+++ b/prometheus/docker-compose.traefik.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 networks:
  default:
    name: ${TRAEFIK_NETWORK_NAME:-traefik}
--- a/redis/docker-compose.yml
+++ b/redis/docker-compose.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 volumes:
  redis:
--- a/signaturepdf/docker-compose.traefik.https.yml
+++ b/signaturepdf/docker-compose.traefik.https.yml
@ -0,0 +1,11 @@
+---
+services:
+  signaturepdf:
+    labels:
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-signaturepdf}.tls.certResolver=letsencrypt
+      # redirect HTTP to HTTPS
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-signaturepdf}_http.rule=Host(`${SIGNATUREPDF_DOMAIN:?err}`)
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-signaturepdf}_http.entrypoints=web
+      - traefik.http.middlewares.${TRAEFIK_ROUTER_NAME:-signaturepdf}_redirect_https.redirectscheme.scheme=https
+      - traefik.http.middlewares.${TRAEFIK_ROUTER_NAME:-signaturepdf}_redirect_https.redirectscheme.permanent=true
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-signaturepdf}_http.middlewares=${TRAEFIK_ROUTER_NAME:-signaturepdf}_redirect_https
--- a/signaturepdf/docker-compose.traefik.yml
+++ b/signaturepdf/docker-compose.traefik.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 networks:
  default:
    name: ${TRAEFIK_NETWORK_NAME:-traefik}
@ -13,4 +11,4 @@ services:
      - traefik.enable=true
      - traefik.docker.network=${TRAEFIK_NETWORK_NAME:-traefik}
      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-signaturepdf}.rule=Host(`${SIGNATUREPDF_DOMAIN:?err}`)
-      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-signaturepdf}.entrypoints=web
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-signaturepdf}.entrypoints=${TRAEFIK_ENTRYPOINTS:-web}
--- a/signaturepdf/docker-compose.yml
+++ b/signaturepdf/docker-compose.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 volumes:
  signaturepdf:
    name: ${SIGNATUREPDF_VOLUME_NAME:-signaturepdf}
@ -21,3 +19,5 @@ services:
      PDF_STORAGE_PATH: ${PDF_STORAGE_PATH}
      DISABLE_ORGANIZATION: ${DISABLE_ORGANIZATION}
      PDF_DEMO_LINK: ${PDF_DEMO_LINK}
+      DEFAULT_LANGUAGE: ${DEFAULT_LANGUAGE:-fr_FR.UTF-8}
+      PDF_STORAGE_ENCRYPTION: ${PDF_STORAGE_ENCRYPTION:-true}
--- a/traefik/docker-compose.network.yml
+++ b/traefik/docker-compose.network.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 networks:
  default:
--- a/traefik/docker-compose.ovh.yml
+++ b/traefik/docker-compose.ovh.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 services:
  traefik:
--- a/traefik/docker-compose.redirect.yml
+++ b/traefik/docker-compose.redirect.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 services:
  traefik:
--- a/traefik/docker-compose.secure.yml
+++ b/traefik/docker-compose.secure.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 networks:
  default:
--- a/traefik/docker-compose.yml
+++ b/traefik/docker-compose.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 volumes:
  traefik:
--- a/uptimekuma/docker-compose.local.yml
+++ b/uptimekuma/docker-compose.local.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  uptimekuma:
    ports:
--- a/uptimekuma/docker-compose.traefik.yml
+++ b/uptimekuma/docker-compose.traefik.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 networks:
  default:
    name: ${TRAEFIK_NETWORK_NAME:-traefik}
--- a/uptimekuma/docker-compose.yml
+++ b/uptimekuma/docker-compose.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 volumes:
  uptimekuma:
    name: ${UPTIMEKUMA_VOLUME_NAME:-uptimekuma}
--- a/vaultwarden/.env
+++ b/vaultwarden/.env
@ -9,7 +9,7 @@ COMPOSE_FILE=${SERVICES_DIR}/vaultwarden/docker-compose.yml

 #VAULTWARDEN_IMAGE=
 #VAULTWARDEN_VOLUME_NAME=
-VAULTWARDEN_DOMAIN=vaultwarden.local
+SERVICE_DOMAIN=vaultwarden.local

 #VAULTWARDEN_LOG_LEVEL=
 #VAULTWARDEN_SIGNUPS_ALLOWED=false
--- a/vaultwarden/README.md
+++ b/vaultwarden/README.md
@ -10,6 +10,20 @@ 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]
--- a/vaultwarden/docker-compose.postgres.yml
+++ b/vaultwarden/docker-compose.postgres.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  vaultwarden:
    depends_on:
--- a/vaultwarden/docker-compose.smtp.yml
+++ b/vaultwarden/docker-compose.smtp.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 services:
  vaultwarden:
    environment:
--- a/vaultwarden/docker-compose.sso.yml
+++ b/vaultwarden/docker-compose.sso.yml
@ -0,0 +1,25 @@
+---
+
+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}
--- a/vaultwarden/docker-compose.traefik.https.yml
+++ b/vaultwarden/docker-compose.traefik.https.yml
@ -0,0 +1,12 @@
+---
+
+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
--- a/vaultwarden/docker-compose.traefik.yml
+++ b/vaultwarden/docker-compose.traefik.yml
@ -1,7 +1,5 @@
 ---

-version: "3.8"
-
 networks:
  default:
    name: ${TRAEFIK_NETWORK_NAME:-traefik}
@ -12,5 +10,5 @@ services:
    labels:
      - traefik.enable=true
      - traefik.docker.network=${TRAEFIK_NETWORK_NAME:-traefik}
-      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-vaultwarden}.rule=Host(`${VAULTWARDEN_DOMAIN:?err}`)
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-vaultwarden}.rule=Host(`${SERVICE_DOMAIN:?err}`)
      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-vaultwarden}.entrypoints=${TRAEFIK_ENTRYPOINTS:-web}
--- a/vaultwarden/docker-compose.yml
+++ b/vaultwarden/docker-compose.yml
@ -1,22 +1,26 @@
 ---

-version: "3.8"
-
 volumes:
  vaultwarden:
    name: ${VAULTWARDEN_VOLUME_NAME:-vaultwarden}

 services:
  vaultwarden:
-    image:  ${VAULTWARDEN_IMAGE:-vaultwarden/server:1.27.0-alpine}
+    image:  ${VAULTWARDEN_IMAGE:-vaultwarden/server:1.34.1-alpine}
    container_name: ${VAULTWARDEN_CONTAINER_NAME:-vaultwarden}
    restart: always
    environment:
      ADMIN_TOKEN: ${VAULTWARDEN_ADMIN_TOKEN:?err}
-      DOMAIN: https://${VAULTWARDEN_DOMAIN:?err}
+      DOMAIN: https://${SERVICE_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}
-      SIGNUPS_ALLOWED: ${VAULTWARDEN_SIGNUPS_ALLOWED:-true}
+      ORG_GROUPS_ENABLED: ${VAULTWARDEN_ORG_GROUPS_ENABLED:-false}
    volumes:
      - vaultwarden:/data
      - /etc/timezone:/etc/timezone:ro
--- a/vikunja/docker-compose.local.yml
+++ b/vikunja/docker-compose.local.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 services:
  vikunja_api:
--- a/vikunja/docker-compose.prometheus.yml
+++ b/vikunja/docker-compose.prometheus.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 # https://vikunja.io/docs/config-options/#metrics

--- a/vikunja/docker-compose.redis.yml
+++ b/vikunja/docker-compose.redis.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 # https://vikunja.io/docs/config-options/#redis

--- a/vikunja/docker-compose.smtp.yml
+++ b/vikunja/docker-compose.smtp.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 # https://vikunja.io/docs/config-options/#mailer

--- a/vikunja/docker-compose.traefik.yml
+++ b/vikunja/docker-compose.traefik.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 networks:
  default:
--- a/vikunja/docker-compose.yml
+++ b/vikunja/docker-compose.yml
@ -1,4 +1,4 @@
-version: "3.8"
+---

 # https://vikunja.io/docs/config-options
 # https://vikunja.io/docs/full-docker-example/
Author	SHA1	Message	Date
Simon C	b03a0e3085	feat(Vaultwarden): Add new org groups feature	2025-06-11 22:03:42 +02:00
Simon C	a5b7aca9b7	feat(LLDAP): Utilisation de la nouvelle variable plus généric	2024-10-17 14:13:47 +02:00
Simon	1f9bd5ea4b	Merge pull request 'feat(Vaultwarden): Change domain variable' (#82 ) from vaultwarden_domain into main Reviewed-on: #82	2024-10-01 10:51:14 +02:00
Simon C	e2931630c6	feat(Vaultwarden): Change domain variable	2024-10-01 10:49:32 +02:00
Simon	a0300d20d6	Merge pull request 'feat(Vaultwarden): Remove experimental configuration' (#80 ) from vaultwarden into main Reviewed-on: #80	2024-08-02 16:52:54 +02:00
Simon C	d9653fc215	feat(Vaultwarden): Remove experimental configuration	2024-08-02 16:52:33 +02:00
Simon	15a13f1eff	Merge pull request 'vaultwarden' (#79 ) from vaultwarden into main ## Détails - Ajout d'une redirection automatique du trafic HTTP - Ajout de documentation pour la traduction des mails - Ajout des variables pour la configuration du service ainsi que du SSO ## Pourquoi - Pour faciliter son intégration sur un serveur qui fait office de _entrypoint_ - Pour avoir des mails envoyé en Français - Pour faciliter le déploiement de Vaultwarden Reviewed-on: #79	2024-08-01 16:17:30 +02:00
Simon C	b2509bfd67	feat(Vaultwarden): Ajout de la configuration SSO	2024-08-01 16:13:57 +02:00
Simon C	78300c3bf4	feat(Vaultwarden): Ajout de variable de configuration du service	2024-08-01 16:13:57 +02:00
Simon C	2630301d58	feat(Vaultwarden): Ajout de documentation pour la traduction des mails	2024-08-01 16:13:57 +02:00
Simon C	3f2a4b78fb	feat(Vaultwarden): Ajout d'une configuration de Traefik pour redirection automatique HTTP	2024-08-01 16:13:57 +02:00
Simon	342d7bfa58	Merge pull request 'Mise à jour de SignaturePDF' (#78 ) from signaturepdf into main ## Détails - Ajout des dernière variables par défaut - Ajout d'une redirection HTTP vers HTTPS ## Pourquoi - Pour changer les variables si besoin - Pour pouvoir mettre en place la redirection facilement Reviewed-on: #78	2024-07-31 10:49:27 +02:00
Simon C	fad68813ae	feat(SignaturePDF): Add Traefik redirection	2024-07-31 10:48:05 +02:00
Simon C	f4d72bff12	feat(SignaturePDF): Add default variable for # Installation variable	2024-07-31 10:48:05 +02:00
Simon C	532c0a9c7b	feat(SignaturePDF): Add default language variable	2024-07-31 10:48:05 +02:00
Simon C	e24754bc44	feat(SignaturePDF): Add Traefik entrypoints variable	2024-07-31 10:48:05 +02:00
Simon	b770dfd525	Merge pull request 'feat(Nextcloud): Update default value of SMTP' (#76 ) from fix_nextcloud_smtp into main Reviewed-on: #76	2024-03-29 17:38:54 +01:00
Simon C	ec039c4474	feat(Nextcloud): Update default value of SMTP	2024-03-29 17:38:38 +01:00
Simon	16a583e326	Merge pull request 'feat(Docker Compose): Remove obsolete version variable' (#75 ) from docker_compose_version into main Reviewed-on: #75	2024-03-25 14:36:04 +01:00
Simon C	4f3c112404	feat(Docker Compose): Remove obsolete version variable see: https://github.com/docker/compose/issues/11628	2024-03-25 14:35:05 +01:00
Simon	bbd45d8f3f	Merge pull request 'feat(Drone Server): Add external parameter for network' (#74 ) from drone into main Reviewed-on: #74	2024-03-25 14:19:52 +01:00
Simon C	68820ec859	feat(Drone Server): Add external parameter for network	2024-03-25 14:19:17 +01:00