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

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

@@ -11,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

@@ -19,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}

snikket/.env

@@ -1,24 +0,0 @@
-########
-# DOCKER
-
-SERVICES_DIR=".."
-COMPOSE_FILE=${SERVICES_DIR}/snikket/docker-compose.yml:${SERVICES_DIR}/snikket/docker-compose.local.yml
-# COMPOSE_PROJECT_NAME=
-
-## APP
-
-# SNIKKET_DOMAIN={{ SNIKKET_DOMAIN }}
-SNIKKET_CONTAINER_NAME=snikket
-SNIKKET_DATA_VOLUME_NAME=snikket_data
-SNIKKET_ACME_CHALLENGES_VOLUME_NAME=acme_challenges
-# SNIKKET_SERVER_IMAGE=
-# SNIKKET_WEB_PORTAL_IMAGE=
-# SNIKKET_CERT_MANAGER_IMAGE
-# SNIKKET_WEB_PROXY_IMAGE
-
-#########
-# TRAEFIK
-
-# TRAEFIK_NETWORK_NAME=
-# TRAEFIK_ROUTER_NAME=
-# TRAEFIK_ENTRYPOINTS=

snikket/README.md

@@ -1,22 +0,0 @@
-# Snikket
-
-> Snikket est un service de messagerie instantanée basée sur le protocole XMPP destiné à être utilisé d'abord sur téléphone.
-
-## Clients
-
-Pour utiliser Snikket sur un téléphone Android, vous pouvez télécharger l'application sur F-droid (recommandé) ou sur le Google Play Store.
-
-Sur Linux, nous recommandons le client Dino (d'abord créer son compte Snikket via le téléphone).
-Sur iPhone, vous pouvez aussi télécharger l'application Snikket qui sera cependant moins complète que sur Android.
-
-## Liens
-
-- [Site Officiel][site]
-- [Documentation][documentation]
-- [Code source][source]
-- [Docker Hub][dockerhub]
-
-[site]: https://snikket.org
-[source]: https://github.com/snikket-im/snikket-selfhosted
-[documentation]: https://snikket.org/service/quickstart/
-[dockerhub]: https://hub.docker.com/r/snikket/snikket-server

snikket/docker-compose.local.yml

@@ -1,13 +0,0 @@
----
-
-version: "3.8"
-
-services:
-  snikket_proxy:
-    network_mode: host
-  snikket_certs:
-    network_mode: host
-  snikket_portal:
-    network_mode: host
-  snikket_server:
-    network_mode: host

snikket/docker-compose.traefik.yml

@@ -1,15 +0,0 @@
----
-
-version: "3.8"
-
-networks:
-  default:
-    name: ${TRAEFIK_NETWORK_NAME:-traefik}
-
-services:
-  snikket_proxy:
-    labels:
-      - traefik.enable=true
-      - traefik.docker.network=${TRAEFIK_NETWORK_NAME:-traefik}
-      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-snikket}.rule=Host(`${SNIKKET_DOMAIN:?err}`)
-      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-snikket}.entrypoints=${TRAEFIK_ENTRYPOINTS:-web}

snikket/docker-compose.yml

@@ -1,48 +0,0 @@
----
-
-version: "3.3"
-
-services:
-  snikket_proxy:
-    container_name: ${SNIKKET_CONTAINER_NAME:-snikket}_proxy
-    image: ${SNIKKET_WEB_PROXY_IMAGE:-snikket/snikket-web-proxy:beta}
-    environment:
-      - SNIKKET_DOMAIN: ${SNIKKET_DOMAIN:?err}
-      - SNIKKET_ADMIN_EMAIL: ${SNIKKET_ADMIN_EMAIL:?err}
-    volumes:
-      - snikket_data:/snikket
-      - acme_challenges:/var/www/html/.well-known/acme-challenge
-    restart: "unless-stopped"
-  snikket_certs:
-    container_name: ${SNIKKET_CONTAINER_NAME:-snikket}-certs
-    image: ${SNIKKET_CERT_MANAGER_IMAGE:-snikket/snikket-cert-manager:beta}
-    environment:
-      - SNIKKET_DOMAIN: ${SNIKKET_DOMAIN:?err}
-      - SNIKKET_ADMIN_EMAIL: ${SNIKKET_ADMIN_EMAIL:?err}
-    volumes:
-      - snikket_data:/snikket
-      - acme_challenges:/var/www/.well-known/acme-challenge
-    restart: "unless-stopped"
-  snikket_portal:
-    container_name: ${SNIKKET_CONTAINER_NAME:-snikket}-portal
-    image: ${SNIKKET_WEB_PORTAL_IMAGE:-snikket/snikket-web-portal:beta}
-    environment:
-      - SNIKKET_DOMAIN: ${SNIKKET_DOMAIN:?err}
-      - SNIKKET_ADMIN_EMAIL: ${SNIKKET_ADMIN_EMAIL:?err}
-    restart: "unless-stopped"
-
-  snikket_server:
-    container_name: ${SNIKKET_CONTAINER_NAME:-snikket}
-    image: ${SNIKKET_SERVER_IMAGE:-snikket/snikket-server:beta}
-    volumes:
-      - snikket_data:/snikket
-    environment:
-      - SNIKKET_DOMAIN: ${SNIKKET_DOMAIN:?err}
-      - SNIKKET_ADMIN_EMAIL: ${SNIKKET_ADMIN_EMAIL:?err}
-    restart: "unless-stopped"
-
-volumes:
-  acme_challenges:
-    name: ${SNIKKET_ACME_CHALLENGES_VOLUME_NAME:-acme_challenges}
-  snikket_data:
-    name: ${SNIKKET_DATA_VOLUME_NAME:-snikket_data}