Merge pull request 'feat(Listmonk): Fix le domain pour les images par exemple' (#81) from vaultwarden into main

Reviewed-on: #81

clickhouse/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 volumes:
   clickhouse:

directus/docker-compose.redis.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   directus:
     environment:

directus/docker-compose.smtp.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   directus:
     environment:

directus/docker-compose.traefik.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 networks:
   default:
     name: ${TRAEFIK_NETWORK_NAME:-traefik}

directus/docker-compose.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 volumes:
   directus:
     name: ${DIRECTUS_VOLUME_NAME:-directus}

drone/runner/docker-compose.dashboard.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 # https://docs.drone.io/runner/docker/configuration/dashboard/
 
 services:

drone/runner/docker-compose.local.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   drone-runner:
     ports:

drone/runner/docker-compose.logging.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 # https://docs.drone.io/runner/docker/configuration/logging/
 
 services:

drone/runner/docker-compose.traefik.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 networks:
   default:
     name: ${TRAEFIK_NETWORK_NAME}

drone/runner/docker-compose.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 # https://docs.drone.io/runner/docker/installation/linux/
 
 services:

drone/server/docker-compose.cookie.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 # https://docs.drone.io/server/cookie/
 
 services:

drone/server/docker-compose.gitea.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 # https://docs.drone.io/server/provider/gitea/
 
 services:

drone/server/docker-compose.header.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 # https://docs.drone.io/server/headers/
 
 services:

drone/server/docker-compose.local.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   drone-server:
     ports:

drone/server/docker-compose.logging.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 # https://docs.drone.io/server/logging/
 
 services:

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/
 

drone/server/docker-compose.traefik.yml

@@ -1,10 +1,9 @@
 ---
 
-version: "3.8"
-
 networks:
   default:
     name: ${TRAEFIK_NETWORK_NAME}
+    external: true
 
 services:
   drone-server:

drone/server/docker-compose.user.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 # https://docs.drone.io/server/user/registration/
 
 services:

drone/server/docker-compose.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 volumes:
   drone-server:
     name: ${DRONE_SERVER_VOLUME_NAME:-drone-server}

geoip/docker-compose.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 volumes:
   geoip:
     name: ${GEOIP_VOLUME_NAME:-geoip}

geoipupdate/docker-compose.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 volumes:
   geoipupdate:
     name: ${GEOIPUPDATE_VOLUME_NAME:-geoipupdate}

gitea/docker-compose.metrics.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   gitea:
     environment:

gitea/docker-compose.override.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   gitea:
     ports:

gitea/docker-compose.postgres.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   gitea:
     environment:

gitea/docker-compose.smtp.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   gitea:
     environment:

gitea/docker-compose.traefik.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 networks:
   default:
     name: ${TRAEFIK_NETWORK_NAME:-traefik}

gitea/docker-compose.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 volumes:
   gitea:
     name: ${GITEA_VOLUME_NAME:-gitea}

grafana/docker-compose.postgres.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 services:
   grafana:

grafana/docker-compose.redis.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 services:
   grafana:

grafana/docker-compose.smtp.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 services:
   grafana:

grafana/docker-compose.traefik.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 networks:
   default:

grafana/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: "3.8"
 
 volumes:
   grafana:

hedgedoc/docker-compose.traefik.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 networks:
   default:

hedgedoc/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 volumes:
   hedgedoc:

listmonk/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 networks:
   default:
@@ -20,7 +20,7 @@ services:
     depends_on:
       - postgres
     environment:
-      LISTMONK_app__address: 0.0.0.0:9000
+      LISTMONK_app__address: ${LISTMONK_DOMAIN}
       LISTMONK_app__admin_username: ${LISTMONK_ADMIN_USERNAME:?err}
       LISTMONK_app__admin_password: ${LISTMONK_ADMIN_PASSWORD:?err}
       LISTMONK_db__host: ${POSTGRES_CONTAINER_NAME:?err}

lldap/docker-compose.local.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   lldap:
     ports:

lldap/docker-compose.postgres.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   lldap:
     environment:

lldap/docker-compose.smtp.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   lldap:
     environment:

lldap/docker-compose.traefik.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 networks:
   default:
     name: ${TRAEFIK_NETWORK_NAME:-traefik}

lldap/docker-compose.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 volumes:
   lldap:
     name: ${LLDAP_VOLUME_NAME:-lldap}

mobilizon/docker-compose.local.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   mobilizon:
     ports:

mobilizon/docker-compose.traefik.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 networks:
   default:
     name: ${TRAEFIK_NETWORK_NAME:-traefik}

mobilizon/docker-compose.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 volumes:
   mobilizon:
     name: ${MOBILIZON_VOLUME_NAME:-mobilizon}

nextcloud/docker-compose.config.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   nextcloud-fpm:
     environment:

nextcloud/docker-compose.local.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   nextcloud-web:
     ports:

nextcloud/docker-compose.postgres.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   nextcloud-fpm:
     depends_on:

nextcloud/docker-compose.redis.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   nextcloud-fpm:
     depends_on:

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}

nextcloud/docker-compose.traefik.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 networks:
   default:
     name: ${TRAEFIK_NETWORK_NAME:-traefik}

nextcloud/docker-compose.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 volumes:
   nextcloud:
     name: ${NEXTCLOUD_VOLUME_NAME:-nextcloud}

plausible/docker-compose.clickhouse.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 services:
   clickhouse:

plausible/docker-compose.geoip.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 services:
   plausible:

plausible/docker-compose.google.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 services:
   plausible:

plausible/docker-compose.local.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 services:
   plausible:

plausible/docker-compose.smtp.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 services:
   plausible:

plausible/docker-compose.traefik.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 networks:
   default:

plausible/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 volumes:
   plausible:

postgres/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 volumes:
   postgres:

prometheus/docker-compose.traefik.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 networks:
   default:
     name: ${TRAEFIK_NETWORK_NAME:-traefik}

redis/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 volumes:
   redis:

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

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}

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}

traefik/docker-compose.network.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 networks:
   default:

traefik/docker-compose.ovh.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 services:
   traefik:

traefik/docker-compose.redirect.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 services:
   traefik:

traefik/docker-compose.secure.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 networks:
   default:

traefik/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 volumes:
   traefik:

uptimekuma/docker-compose.local.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   uptimekuma:
     ports:

uptimekuma/docker-compose.traefik.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 networks:
   default:
     name: ${TRAEFIK_NETWORK_NAME:-traefik}

uptimekuma/docker-compose.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 volumes:
   uptimekuma:
     name: ${UPTIMEKUMA_VOLUME_NAME:-uptimekuma}

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]

vaultwarden/docker-compose.postgres.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   vaultwarden:
     depends_on:

vaultwarden/docker-compose.smtp.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 services:
   vaultwarden:
     environment:

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}

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(`${VAULTWARDEN_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

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 networks:
   default:
     name: ${TRAEFIK_NETWORK_NAME:-traefik}

vaultwarden/docker-compose.yml

@@ -1,7 +1,5 @@
 ---
 
-version: "3.8"
-
 volumes:
   vaultwarden:
     name: ${VAULTWARDEN_VOLUME_NAME:-vaultwarden}
@@ -14,9 +12,14 @@ services:
     environment:
       ADMIN_TOKEN: ${VAULTWARDEN_ADMIN_TOKEN:?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}
-      SIGNUPS_ALLOWED: ${VAULTWARDEN_SIGNUPS_ALLOWED:-true}
     volumes:
       - vaultwarden:/data
       - /etc/timezone:/etc/timezone:ro

vikunja/docker-compose.local.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 services:
   vikunja_api:

vikunja/docker-compose.prometheus.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 # https://vikunja.io/docs/config-options/#metrics
 

vikunja/docker-compose.redis.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 # https://vikunja.io/docs/config-options/#redis
 

vikunja/docker-compose.smtp.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 # https://vikunja.io/docs/config-options/#mailer
 

vikunja/docker-compose.traefik.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 networks:
   default:

vikunja/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.8"
+---
 
 # https://vikunja.io/docs/config-options
 # https://vikunja.io/docs/full-docker-example/