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

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:

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/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.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}

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/