From 30fd1db0a325d1690686527b78813291a1371a1e Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Tue, 22 Feb 2022 19:12:54 +0100
Subject: [PATCH 01/43] fix(GeoIP Update): Frequency

---
 geoipupdate/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geoipupdate/docker-compose.yml b/geoipupdate/docker-compose.yml
index dc3a99d..9e83d1e 100644
--- a/geoipupdate/docker-compose.yml
+++ b/geoipupdate/docker-compose.yml
@@ -17,6 +17,6 @@ services:
       GEOIPUPDATE_ACCOUNT_ID: ${GEOIPUPDATE_ACCOUNT_ID:?err}
       GEOIPUPDATE_LICENSE_KEY: ${GEOIPUPDATE_LICENSE_KEY:?err}
       GEOIPUPDATE_EDITION_IDS: ${GEOIPUPDATE_EDITION_IDS:-GeoLite2-City}
-      GEOIPUPDATE_FREQUENCY: ${GEOIP_SCHEDULE:-72}
+      GEOIPUPDATE_FREQUENCY: ${GEOIPUPDATE_FREQUENCY:-72}
       GEOIPUPDATE_VERBOSE: ${GEOIPUPDATE_VERBOSE:-false}
       GEOIPUPDATE_DB_DIR: ${GEOIPUPDATE_DB_DIR:-/usr/share/GeoIP}
-- 
2.40.1


From d951d0c8f56df301c5de361b9daaaf6033eb2d82 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Tue, 22 Feb 2022 19:13:15 +0100
Subject: [PATCH 02/43] docs(Plausible): Add default variables

---
 plausible/.env | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plausible/.env b/plausible/.env
index f4b4b29..80eebb8 100644
--- a/plausible/.env
+++ b/plausible/.env
@@ -19,6 +19,8 @@ ADMIN_USER_NAME=example
 ADMIN_USER_EMAIL=email@example.org
 ADMIN_USER_PWD=change-me
 SECRET_KEY_BASE=AFnMQwN54ovHIqCQQGFZX5gUFpgpxasCEnzQwQsyfZLPRbiwzDYAqYDJQlQM8SbmicVJr97axXaSCfXD9zSEQQ==
+#DISABLE_AUTH=
+#DISABLE_REGISTRATION=
 
 ## POSTGRES
 
-- 
2.40.1


From 768bf9b71d6731cb7f479f979322c62d40637800 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Wed, 23 Feb 2022 09:59:05 +0100
Subject: [PATCH 03/43] feat(Plausible): Add more environment variables

---
 plausible/docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plausible/docker-compose.yml b/plausible/docker-compose.yml
index f8875e4..56ed4f9 100644
--- a/plausible/docker-compose.yml
+++ b/plausible/docker-compose.yml
@@ -23,6 +23,8 @@ services:
       DISABLE_REGISTRATION: ${DISABLE_REGISTRATION:-false}
       DATABASE_URL: postgres://${POSTGRES_USER:?err}:${POSTGRES_PASSWORD:?err}@${POSTGRES_CONTAINER_NAME:-postgres}:5432/${POSTGRES_DB:?err}
       CLICKHOUSE_DATABASE_URL: http://${CLICKHOUSE_CONTAINER_NAME:-clickhouse}:8123/${CLICKHOUSE_CONTAINER_NAME:-clickhouse}
+      SITE_LIMIT: ${SITE_LIMIT:-3}
+      SELFHOST: ${SELFHOST:-true}
     volumes:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
-- 
2.40.1


From 47ce108eb6c990208e8e5c6f45afa846fa3d596d Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Mon, 7 Mar 2022 10:58:08 +0100
Subject: [PATCH 04/43] chore(Directus): Upgrade to 9.6.0

https://github.com/directus/directus/releases/tag/v9.6.0
---
 directus/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/directus/docker-compose.yml b/directus/docker-compose.yml
index 125f497..b44ba75 100644
--- a/directus/docker-compose.yml
+++ b/directus/docker-compose.yml
@@ -9,7 +9,7 @@ volumes:
 services:
   directus:
     container_name: ${DIRECTUS_CONTAINER_NAME:-directus}
-    image: ${DIRECTUS_IMAGE:-directus/directus:9.5.1}
+    image: ${DIRECTUS_IMAGE:-directus/directus:9.6.0}
     restart: always
     volumes:
       - directus:/directus/uploads
-- 
2.40.1


From a60026a6726b14d1df33c710f77cc807c577f99f Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Mon, 7 Mar 2022 11:09:18 +0100
Subject: [PATCH 05/43] chore(Grafana): Upgrade to 8.4.3

https://github.com/grafana/grafana/releases/tag/v8.4.3
---
 grafana/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grafana/docker-compose.yml b/grafana/docker-compose.yml
index 2d7c4f6..dcba3c7 100644
--- a/grafana/docker-compose.yml
+++ b/grafana/docker-compose.yml
@@ -8,7 +8,7 @@ volumes:
 services:
   grafana:
     container_name: ${GRAFANA_CONTAINER_NAME:-grafana}
-    image: ${GRAFANA_IMAGE:-grafana/grafana:8.4.1}
+    image: ${GRAFANA_IMAGE:-grafana/grafana:8.4.3}
     restart: always
     volumes:
       - grafana:/var/lib/grafana
-- 
2.40.1


From 63246c442c008f64f999066342be21232f7f85c6 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Mon, 7 Mar 2022 11:11:39 +0100
Subject: [PATCH 06/43] chore(Prometheus): Upgrade to 2.33.4

https://github.com/prometheus/prometheus/releases/tag/v2.33.4
---
 prometheus/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prometheus/docker-compose.yml b/prometheus/docker-compose.yml
index ddad060..66fd702 100644
--- a/prometheus/docker-compose.yml
+++ b/prometheus/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     build:
       context: .
       args:
-        PROMETHEUS_IMAGE: ${PROMETHEUS_IMAGE:-prom/prometheus:v2.33.3}
+        PROMETHEUS_IMAGE: ${PROMETHEUS_IMAGE:-prom/prometheus:v2.33.4}
     volumes:
       - prometheus:/prometheus
     restart: always
-- 
2.40.1


From 1931adafa4c304461e7cc61928bc0fa5c374a571 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Mon, 7 Mar 2022 11:15:32 +0100
Subject: [PATCH 07/43] chore(Drone Server): Upgrade to 2.10.0

https://github.com/harness/drone/releases/tag/v2.10.0
---
 drone/server/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drone/server/docker-compose.yml b/drone/server/docker-compose.yml
index 3cae11b..ed28ce5 100644
--- a/drone/server/docker-compose.yml
+++ b/drone/server/docker-compose.yml
@@ -9,7 +9,7 @@ volumes:
 services:
   drone-server:
     container_name: ${DRONE_SERVER_CONTAINER_NAME:-drone-server}
-    image: ${DRONE_SERVER_IMAGE:-drone/drone:2.9.1}
+    image: ${DRONE_SERVER_IMAGE:-drone/drone:2.10.0}
     restart: always
     environment:
       # https://docs.drone.io/server/reference/drone-rpc-secret/
-- 
2.40.1


From 1f7e6102970c60cc722bf38745b1e0b0035e9dc3 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Mon, 7 Mar 2022 11:20:33 +0100
Subject: [PATCH 08/43] chore(Gitea): Upgrade to 1.16.3

https://github.com/go-gitea/gitea/releases/tag/v1.16.3
---
 gitea/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index 7c3280e..a43804e 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -7,7 +7,7 @@ volumes:
 services:
   gitea:
     container_name: ${GITEA_CONTAINER_NAME:-gitea}
-    image: ${GITEA_IMAGE:-gitea/gitea:1.16.1}
+    image: ${GITEA_IMAGE:-gitea/gitea:1.16.3}
     restart: always
     environment:
       # - USER_UID=1000
-- 
2.40.1


From cfd8b5a2ce5f9ce4282167c15c9af50169904c7a Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Mon, 7 Mar 2022 11:51:21 +0100
Subject: [PATCH 09/43] feat(Directus): Add timezone variable

---
 directus/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/directus/docker-compose.yml b/directus/docker-compose.yml
index b44ba75..cc5f093 100644
--- a/directus/docker-compose.yml
+++ b/directus/docker-compose.yml
@@ -13,8 +13,6 @@ services:
     restart: always
     volumes:
       - directus:/directus/uploads
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
     depends_on:
       - postgres
       - redis
@@ -34,5 +32,7 @@ services:
       DB_USER: ${POSTGRES_USER:?err}
       DB_PASSWORD: ${POSTGRES_PASSWORD:?err}
 
+      TZ: ${TZ:-Europe/Paris}
+
       PUID: ${DIRECTUS_PUID:-1000}
       PGID: ${DIRECTUS_PGID:-1000}
-- 
2.40.1


From c4248a6f97b5b9bc45d7225ef87849d86524ba4f Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Mon, 7 Mar 2022 11:51:48 +0100
Subject: [PATCH 10/43] feat(Plausible): Add log level variable

---
 plausible/docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plausible/docker-compose.yml b/plausible/docker-compose.yml
index 56ed4f9..1834df3 100644
--- a/plausible/docker-compose.yml
+++ b/plausible/docker-compose.yml
@@ -25,6 +25,7 @@ services:
       CLICKHOUSE_DATABASE_URL: http://${CLICKHOUSE_CONTAINER_NAME:-clickhouse}:8123/${CLICKHOUSE_CONTAINER_NAME:-clickhouse}
       SITE_LIMIT: ${SITE_LIMIT:-3}
       SELFHOST: ${SELFHOST:-true}
+      LOG_LEVEL: ${LOG_LEVEL:-warn}
     volumes:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
-- 
2.40.1


From db74e9229169a74f1eb891d5c374cb30c86b9abc Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Mon, 7 Mar 2022 16:02:21 +0100
Subject: [PATCH 11/43] fix(Hedgedoc): Update backup folder

---
 hedgedoc/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hedgedoc/docker-compose.yml b/hedgedoc/docker-compose.yml
index 07ca998..27c08a6 100644
--- a/hedgedoc/docker-compose.yml
+++ b/hedgedoc/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     depends_on:
       - postgres
     volumes:
-      - hedgedoc:/opt/hedgedoc/public/uploads
+      - hedgedoc:/config/uploads
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     environment:
-- 
2.40.1


From 9d3175df696e2c20a0c6a397271a382afad50a8d Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Wed, 13 Apr 2022 22:56:15 +0200
Subject: [PATCH 12/43] chore(Directus): Upgrade to 9.8.0

https://github.com/directus/directus/releases/tag/v9.8.0
---
 directus/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/directus/docker-compose.yml b/directus/docker-compose.yml
index cc5f093..1422d1d 100644
--- a/directus/docker-compose.yml
+++ b/directus/docker-compose.yml
@@ -9,7 +9,7 @@ volumes:
 services:
   directus:
     container_name: ${DIRECTUS_CONTAINER_NAME:-directus}
-    image: ${DIRECTUS_IMAGE:-directus/directus:9.6.0}
+    image: ${DIRECTUS_IMAGE:-directus/directus:9.8.0}
     restart: always
     volumes:
       - directus:/directus/uploads
-- 
2.40.1


From 62a5159232de209d18dbbe51c15d5eb31bf3ec02 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Wed, 13 Apr 2022 22:58:18 +0200
Subject: [PATCH 13/43] chore(Drone): Upgrade to 2.11.1

https://github.com/harness/drone/releases/tag/v2.11.1
---
 drone/server/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drone/server/docker-compose.yml b/drone/server/docker-compose.yml
index ed28ce5..ae49725 100644
--- a/drone/server/docker-compose.yml
+++ b/drone/server/docker-compose.yml
@@ -9,7 +9,7 @@ volumes:
 services:
   drone-server:
     container_name: ${DRONE_SERVER_CONTAINER_NAME:-drone-server}
-    image: ${DRONE_SERVER_IMAGE:-drone/drone:2.10.0}
+    image: ${DRONE_SERVER_IMAGE:-drone/drone:2.11.1}
     restart: always
     environment:
       # https://docs.drone.io/server/reference/drone-rpc-secret/
-- 
2.40.1


From 3a7e863d0cf343ad57db63bf856f66fc25a1e6c7 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Wed, 13 Apr 2022 22:59:46 +0200
Subject: [PATCH 14/43] chore(Gitea): Upgrade to 1.16.5

https://github.com/go-gitea/gitea/releases/tag/v1.16.5
---
 gitea/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index a43804e..a2ae51c 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -7,7 +7,7 @@ volumes:
 services:
   gitea:
     container_name: ${GITEA_CONTAINER_NAME:-gitea}
-    image: ${GITEA_IMAGE:-gitea/gitea:1.16.3}
+    image: ${GITEA_IMAGE:-gitea/gitea:1.16.5}
     restart: always
     environment:
       # - USER_UID=1000
-- 
2.40.1


From 7498f639746ba5b3f645aa7c9ae03209d07653da Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Wed, 13 Apr 2022 23:03:44 +0200
Subject: [PATCH 15/43] chore(Grafana): Upgrade to 8.4.6

https://github.com/grafana/grafana/releases/tag/v8.4.6
---
 grafana/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/grafana/docker-compose.yml b/grafana/docker-compose.yml
index dcba3c7..88aa1f9 100644
--- a/grafana/docker-compose.yml
+++ b/grafana/docker-compose.yml
@@ -8,7 +8,7 @@ volumes:
 services:
   grafana:
     container_name: ${GRAFANA_CONTAINER_NAME:-grafana}
-    image: ${GRAFANA_IMAGE:-grafana/grafana:8.4.3}
+    image: ${GRAFANA_IMAGE:-grafana/grafana:8.4.6}
     restart: always
     volumes:
       - grafana:/var/lib/grafana
-- 
2.40.1


From 5b6ce7cfcdec19677a61a117e8eb25f8b7f17920 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Wed, 13 Apr 2022 23:08:01 +0200
Subject: [PATCH 16/43] chore(Hedgedoc): Upgrade to 1.9.3

https://github.com/hedgedoc/hedgedoc/releases/tag/1.9.3
---
 hedgedoc/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hedgedoc/docker-compose.yml b/hedgedoc/docker-compose.yml
index 27c08a6..204d0a2 100644
--- a/hedgedoc/docker-compose.yml
+++ b/hedgedoc/docker-compose.yml
@@ -7,7 +7,7 @@ volumes:
 services:
   hedgedoc:
     container_name: ${HEDGEDOC_CONTAINER_NAME:-hedgedoc}
-    image: ${HEDGEDOC_IMAGE:-linuxserver/hedgedoc:1.9.2-ls44}
+    image: ${HEDGEDOC_IMAGE:-linuxserver/hedgedoc:1.9.3-ls53}
     restart: always
     depends_on:
       - postgres
-- 
2.40.1


From ec4ae3a8b8571d7be1aa162a08e59bb7169debac Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Wed, 13 Apr 2022 23:10:15 +0200
Subject: [PATCH 17/43] chore(Nextcloud): Upgrade to 23.0.3

https://nextcloud.com/changelog/#latest23
---
 nextcloud/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index c6efa21..909e536 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -7,7 +7,7 @@ volumes:
 services:
   nextcloud-fpm:
     container_name: ${NEXTCLOUD_CONTAINER_NAME:-nextcloud}-fpm
-    image: ${NEXTCLOUD_IMAGE:-nextcloud:23.0.2-fpm-alpine}
+    image: ${NEXTCLOUD_IMAGE:-nextcloud:23.0.3-fpm-alpine}
     restart: always
     depends_on:
       - postgres
-- 
2.40.1


From 10337ac53cbbfab3f8fbccdbdf551aa743bf9fe5 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Wed, 13 Apr 2022 23:13:22 +0200
Subject: [PATCH 18/43] chore(Prometheus): Upgrade to 2.34.0

https://github.com/prometheus/prometheus/releases/tag/v2.34.0
---
 prometheus/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prometheus/docker-compose.yml b/prometheus/docker-compose.yml
index 66fd702..b97b1e3 100644
--- a/prometheus/docker-compose.yml
+++ b/prometheus/docker-compose.yml
@@ -12,7 +12,7 @@ services:
     build:
       context: .
       args:
-        PROMETHEUS_IMAGE: ${PROMETHEUS_IMAGE:-prom/prometheus:v2.33.4}
+        PROMETHEUS_IMAGE: ${PROMETHEUS_IMAGE:-prom/prometheus:v2.34.0}
     volumes:
       - prometheus:/prometheus
     restart: always
-- 
2.40.1


From 8da5cc41eda6c103eca0c586f4a5d0d71eb021cc Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Wed, 13 Apr 2022 23:15:32 +0200
Subject: [PATCH 19/43] chore(Registry): Upgrade to 2.8.1

https://github.com/distribution/distribution/releases/tag/v2.8.1
---
 registry/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/registry/docker-compose.yml b/registry/docker-compose.yml
index 003cce9..fd228a9 100644
--- a/registry/docker-compose.yml
+++ b/registry/docker-compose.yml
@@ -7,7 +7,7 @@ volumes:
 services:
   registry:
     container_name: ${REGISTRY_CONTAINER_NAME}
-    image: ${REGISTRY_IMAGE:-registry:2.8.0}
+    image: ${REGISTRY_IMAGE:-registry:2.8.1}
     restart: always
     environment:
       REGISTRY_AUTH: htpasswd
-- 
2.40.1


From ec25f4b76f8317f756cdebf25907396fafb694d9 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Wed, 13 Apr 2022 23:16:23 +0200
Subject: [PATCH 20/43] chore(Traefik): Upgrade to 2.6.3

https://github.com/traefik/traefik/releases/tag/v2.6.3
---
 traefik/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
index 61e093e..651a062 100644
--- a/traefik/docker-compose.yml
+++ b/traefik/docker-compose.yml
@@ -11,7 +11,7 @@ networks:
 services:
   traefik:
     container_name: ${TRAEFIK_CONTAINER_NAME:-traefik}
-    image: ${TRAEFIK_IMAGE:-traefik:v2.6.1}
+    image: ${TRAEFIK_IMAGE:-traefik:v2.6.3}
     restart: always
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-- 
2.40.1


From efcd3891ba37daa11d4a45a8b0c395e552256697 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Fri, 15 Apr 2022 14:54:08 +0200
Subject: [PATCH 21/43] feat(Vikunja): Add new service

---
 README.md                             |  3 +-
 vikunja/.env                          | 86 +++++++++++++++++++++++++++
 vikunja/README.md                     | 12 ++++
 vikunja/docker-compose.local.yml      | 11 ++++
 vikunja/docker-compose.logs.yml       | 17 ++++++
 vikunja/docker-compose.postgres.yml   | 19 ++++++
 vikunja/docker-compose.prometheus.yml | 10 ++++
 vikunja/docker-compose.redis.yml      | 16 +++++
 vikunja/docker-compose.smtp.yml       | 18 ++++++
 vikunja/docker-compose.traefik.yml    | 21 +++++++
 vikunja/docker-compose.yml            | 42 +++++++++++++
 11 files changed, 254 insertions(+), 1 deletion(-)
 create mode 100644 vikunja/.env
 create mode 100644 vikunja/README.md
 create mode 100644 vikunja/docker-compose.local.yml
 create mode 100644 vikunja/docker-compose.logs.yml
 create mode 100644 vikunja/docker-compose.postgres.yml
 create mode 100644 vikunja/docker-compose.prometheus.yml
 create mode 100644 vikunja/docker-compose.redis.yml
 create mode 100644 vikunja/docker-compose.smtp.yml
 create mode 100644 vikunja/docker-compose.traefik.yml
 create mode 100644 vikunja/docker-compose.yml

diff --git a/README.md b/README.md
index 60e30a6..f3ee893 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,8 @@ Vous trouverez dans ce dépôt l'ensemble des services Open Source que RésiLien
 - [HedgeDoc](./hedgedoc) : Prise de note en Markdown collaborative en temps réel
 - [Mobilizon](./mobilizon): Permet l'organisation d'évènements et de gestion de groupes
 - [Nextcloud](./nextcloud) : Site d'hébergement de fichiers et une plateforme de collaboration
-- [Plausible](./plausible) : Plausible est une plateforme d'analyse Web légère et open source.
+- [Plausible](./plausible) : Plausible est une plateforme d'analyse Web légère et open source
+- [Vikunja](./vikunja) : L'application pour organiser sa vie
 
 ### Pour les devs / ops
 
diff --git a/vikunja/.env b/vikunja/.env
new file mode 100644
index 0000000..62a1d6f
--- /dev/null
+++ b/vikunja/.env
@@ -0,0 +1,86 @@
+########
+# DOCKER
+
+#DOCKER_CONTEXT=
+#DOCKER_HOST=
+SERVICES_DIR=..
+COMPOSE_FILE=${SERVICES_DIR}/vikunja/docker-compose.yml:${SERVICES_DIR}/vikunja/docker-compose.local.yml:${SERVICES_DIR}/vikunja/docker-compose.postgres.yml:${SERVICES_DIR}/postgres/docker-compose.yml
+#COMPOSE_PROJECT_NAME=
+
+## APP
+
+#VIKUNJA_API_IMAGE=
+#VIKUNJA_FRONTEND_IMAGE=
+VIKUNJA_CONTAINER_NAME=vikunja
+VIKUNJA_VOLUME_NAME=vikunja
+
+VIKUNJA_DOMAIN=vikunja.example.org
+VIKUNJA_SERVICE_FRONTENDURL=https://vikunja.example.org/
+
+VIKUNJA_SERVICE_JWTSECRET=change-me
+#VIKUNJA_SERVICE_JWTTTL=259200
+#VIKUNJA_SERVICE_JWTTTLLONG=2592000
+#VIKUNJA_SERVICE_MAXITEMSPERPAGE=50
+#VIKUNJA_SERVICE_ENABLECALDAV=true
+#VIKUNJA_SERVICE_ENABLELINKSHARING=true
+#VIKUNJA_SERVICE_ENABLEREGISTRATION=true
+#VIKUNJA_SERVICE_ENABLETASKATTACHMENTS=true
+#VIKUNJA_SERVICE_TIMEZONE=GMT
+#VIKUNJA_SERVICE_ENABLETASKCOMMENTS=true
+#VIKUNJA_SERVICE_ENABLETOTP=true
+#VIKUNJA_SERVICE_ENABLEEMAILREMINDERS=true
+#VIKUNJA_SERVICE_ENABLEUSERDELETION=true
+#VIKUNJA_FILES_BASEPATH=./files
+#VIKUNJA_FILES_MAXSIZE=20MB
+
+##########
+# POSTGRES
+
+#POSTGRES_IMAGE=
+POSTGRES_CONTAINER_NAME=vikunja-postgres-example
+POSTGRES_DB=vikunja-postgres-database-example
+POSTGRES_USER=vikunja-postgres-user-example
+POSTGRES_PASSWORD=vikunja-postgres-password-example
+POSTGRES_VOLUME_NAME=vikunja-postgres-example
+
+#VIKUNJA_DATABASE_TYPE=postgres
+#VIKUNJA_DATABASE_MAXOPENCONNECTIONS=100
+#VIKUNJA_DATABASE_MAXIDLECONNECTIONS=50
+#VIKUNJA_DATABASE_MAXCONNECTIONLIFETIME=10000
+#VIKUNJA_DATABASE_SSLMODE=disable
+
+######
+# SMTP
+
+#VIKUNJA_MAILER_ENABLED=true
+#VIKUNJA_MAILER_SKIPTLSVERIFY=false
+#VIKUNJA_MAILER_QUEUELENGTH=100
+#VIKUNJA_MAILER_QUEUETIMEOUT=30
+#VIKUNJA_MAILER_FORCESSL=false
+
+VIKUNJA_MAILER_HOST=
+#VIKUNJA_MAILER_PORT=465
+VIKUNJA_MAILER_USERNAME=
+VIKUNJA_MAILER_PASSWORD=
+VIKUNJA_MAILER_FROMEMAIL=
+
+############
+# PROMETHEUS
+
+#VIKUNJA_METRICS_ENABLED=false
+#VIKUNJA_METRICS_USERNAME=
+#VIKUNJA_METRICS_PASSWORD=
+
+#######
+# REDIS
+
+#REDIS_IMAGE=
+REDIS_CONTAINER_NAME=vikunja-redis
+REDIS_VOLUME_NAME=vikunja-redis
+
+#########
+# TRAEFIK
+
+#TRAEFIK_NETWORK_NAME=traefik
+#TRAEFIK_ROUTER_NAME=vikunja
+#TRAEFIK_ENTRYPOINTS=web
diff --git a/vikunja/README.md b/vikunja/README.md
new file mode 100644
index 0000000..708a150
--- /dev/null
+++ b/vikunja/README.md
@@ -0,0 +1,12 @@
+# Vikunja
+
+> Vikunja est une application auto-hébergeable (facilement installable avec Yunohost) de gestion de tâches, utilisable depuis son navigateur ou un client desktop. Bien que jeune, l'application offre déjà de nombreuses fonctionnalités.
+>
+> <cite>[Framalibre](https://framalibre.org/content/vikunja)</cite>
+
+## Liens
+
+- [Site officiel](https://vikunja.io/)
+- [Code source](https://kolaente.dev/vikunja/)
+- [Docker Hub](https://hub.docker.com/u/vikunja)
+- [Forum](https://community.vikunja.io/)
diff --git a/vikunja/docker-compose.local.yml b/vikunja/docker-compose.local.yml
new file mode 100644
index 0000000..dbfbc28
--- /dev/null
+++ b/vikunja/docker-compose.local.yml
@@ -0,0 +1,11 @@
+version: "3.8"
+
+services:
+  vikunja_api:
+    ports:
+      - 3456:3456
+  vikunja_frontend:
+    ports:
+      - ${LOCAL_PORT:-80}:80
+    environment:
+      VIKUNJA_API_URL: http://localhost:3456/api/v1
\ No newline at end of file
diff --git a/vikunja/docker-compose.logs.yml b/vikunja/docker-compose.logs.yml
new file mode 100644
index 0000000..ec74292
--- /dev/null
+++ b/vikunja/docker-compose.logs.yml
@@ -0,0 +1,17 @@
+version: "3.8"
+
+# https://vikunja.io/docs/config-options/#log
+
+services:
+  vikunja_api:
+    environment:
+      # VIKUNJA_LOG_PATH
+      VIKUNJA_LOG_ENABLED: ${VIKUNJA_LOG_ENABLED:-true}
+      VIKUNJA_LOG_STANDARD: ${VIKUNJA_LOG_STANDARD:-stdout}
+      VIKUNJA_LOG_LEVEL: ${VIKUNJA_LOG_LEVEL:-INFO} # Possible values (case-insensitive) are CRITICAL, ERROR, WARNING, NOTICE, INFO, DEBUG.
+      VIKUNJA_LOG_DATABASE: ${VIKUNJA_LOG_DATABASE:-off} # Possible values are stdout, stderr, file or off to disable database
+      VIKUNJA_LOG_DATABASELEVEL: ${VIKUNJA_LOG_DATABASELEVEL:-WARNING} # Possible values (case-insensitive) are CRITICAL, ERROR, WARNING, NOTICE, INFO, DEBUG
+      VIKUNJA_LOG_HTTP: ${VIKUNJA_LOG_HTTP:-stdout} # Possible values are stdout, stderr, file or off to disable http logging.
+      VIKUNJA_LOG_ECHO: ${VIKUNJA_LOG_ECHO:-off} # Possible values are stdout, stderr, file or off to disable standard logging.
+      VIKUNJA_LOG_EVENTS: ${VIKUNJA_LOG_EVENTS:-stdout} # Possible values are stdout, stderr, file or off to disable events logging.
+      VIKUNJA_LOG_EVENTSLEVEL: ${VIKUNJA_LOG_EVENTSLEVEL:-INFO} # Possible values (case-insensitive) are ERROR, INFO, DEBUG.
diff --git a/vikunja/docker-compose.postgres.yml b/vikunja/docker-compose.postgres.yml
new file mode 100644
index 0000000..4193043
--- /dev/null
+++ b/vikunja/docker-compose.postgres.yml
@@ -0,0 +1,19 @@
+version: "3.8"
+
+# https://vikunja.io/docs/config-options/#database
+
+services:
+  vikunja_api:
+    depends_on:
+      - postgres
+    environment:
+      VIKUNJA_DATABASE_TYPE: ${VIKUNJA_DATABASE_TYPE:-postgres}
+      VIKUNJA_DATABASE_MAXOPENCONNECTIONS: ${VIKUNJA_DATABASE_MAXOPENCONNECTIONS:-100}
+      VIKUNJA_DATABASE_MAXIDLECONNECTIONS: ${VIKUNJA_DATABASE_MAXIDLECONNECTIONS:-50}
+      VIKUNJA_DATABASE_MAXCONNECTIONLIFETIME: ${VIKUNJA_DATABASE_MAXCONNECTIONLIFETIME:-10000}
+      VIKUNJA_DATABASE_SSLMODE: ${VIKUNJA_DATABASE_SSLMODE:-disable}
+
+      VIKUNJA_DATABASE_HOST: ${POSTGRES_CONTAINER_NAME:-postgres}:5432 # Default name is same as ../postgres/docker-compose.yml:8
+      VIKUNJA_DATABASE_DATABASE: ${POSTGRES_DB:?err}
+      VIKUNJA_DATABASE_USER: ${POSTGRES_USER:?err}
+      VIKUNJA_DATABASE_PASSWORD: ${POSTGRES_PASSWORD:?err}
diff --git a/vikunja/docker-compose.prometheus.yml b/vikunja/docker-compose.prometheus.yml
new file mode 100644
index 0000000..219ce35
--- /dev/null
+++ b/vikunja/docker-compose.prometheus.yml
@@ -0,0 +1,10 @@
+version: "3.8"
+
+# https://vikunja.io/docs/config-options/#metrics
+
+services:
+  vikunja_api:
+    environment:
+      VIKUNJA_METRICS_ENABLED: ${VIKUNJA_METRICS_ENABLED-:false}
+      VIKUNJA_METRICS_USERNAME: ${VIKUNJA_METRICS_USERNAME}
+      VIKUNJA_METRICS_PASSWORD: ${VIKUNJA_METRICS_PASSWORD}
diff --git a/vikunja/docker-compose.redis.yml b/vikunja/docker-compose.redis.yml
new file mode 100644
index 0000000..72289d6
--- /dev/null
+++ b/vikunja/docker-compose.redis.yml
@@ -0,0 +1,16 @@
+version: "3.8"
+
+# https://vikunja.io/docs/config-options/#redis
+
+services:
+  vikunja_api:
+    depends_on:
+      - redis
+    environment:
+      VIKUNJA_CACHE_ENABLED: 'true'
+      VIKUNJA_CACHE_TYPE: redis
+      VIKUNJA_REDIS_ENABLED: 'true'
+
+      VIKUNJA_REDIS_HOST: ${REDIS_CONTAINER_NAME:-redis}:6379 # It's default port because we don't have yet configuration for redis port
+      #VIKUNJA_REDIS_PASSWORD: ${VIKUNJA_REDIS_PASSWORD} # We don't have yet configuration for redis with password
+      VIKUNJA_REDIS_DB: 0 # It's default becouse we don't have yet configuration for redis database name
diff --git a/vikunja/docker-compose.smtp.yml b/vikunja/docker-compose.smtp.yml
new file mode 100644
index 0000000..c9f98c2
--- /dev/null
+++ b/vikunja/docker-compose.smtp.yml
@@ -0,0 +1,18 @@
+version: "3.8"
+
+# https://vikunja.io/docs/config-options/#mailer
+
+services:
+  vikunja_api:
+    environment:
+      VIKUNJA_MAILER_ENABLED: ${VIKUNJA_MAILER_ENABLED:-true}
+      VIKUNJA_MAILER_SKIPTLSVERIFY: ${VIKUNJA_MAILER_SKIPTLSVERIFY:-false}
+      VIKUNJA_MAILER_QUEUELENGTH: ${VIKUNJA_MAILER_QUEUELENGTH:-100}
+      VIKUNJA_MAILER_QUEUETIMEOUT: ${VIKUNJA_MAILER_QUEUETIMEOUT:-30}
+      VIKUNJA_MAILER_FORCESSL: ${VIKUNJA_MAILER_FORCESSL:-false}
+
+      VIKUNJA_MAILER_HOST: ${VIKUNJA_MAILER_HOST:?err}
+      VIKUNJA_MAILER_PORT: ${VIKUNJA_MAILER_PORT:-587}
+      VIKUNJA_MAILER_USERNAME: ${VIKUNJA_MAILER_USERNAME:?err}
+      VIKUNJA_MAILER_PASSWORD: ${VIKUNJA_MAILER_PASSWORD:?err}
+      VIKUNJA_MAILER_FROMEMAIL: ${VIKUNJA_MAILER_FROMEMAIL:?err}
diff --git a/vikunja/docker-compose.traefik.yml b/vikunja/docker-compose.traefik.yml
new file mode 100644
index 0000000..eabf6d1
--- /dev/null
+++ b/vikunja/docker-compose.traefik.yml
@@ -0,0 +1,21 @@
+version: "3.8"
+
+networks:
+  default:
+    name: ${TRAEFIK_NETWORK_NAME:-traefik}
+
+# https://vikunja.io/docs/full-docker-example/#example-with-traefik-2
+
+services:
+  vikunja_api:
+    labels:
+      - traefik.enable=true
+      - traefik.docker.network=${TRAEFIK_NETWORK_NAME:-traefik}
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-vikunja}-api.rule=Host(`${VIKUNJA_DOMAIN:?err}`) && PathPrefix(`/api/v1`, `/dav/`, `/.well-known/`)
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-vikunja}-api.entrypoints=${TRAEFIK_ENTRYPOINTS:-web}
+  vikunja_frontend:
+    labels:
+      - traefik.enable=true
+      - traefik.docker.network=${TRAEFIK_NETWORK_NAME:-traefik}
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-vikunja}-frontend.rule=Host(`${VIKUNJA_DOMAIN:?err}`)
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-vikunja}-frontend.entrypoints=${TRAEFIK_ENTRYPOINTS:-web}
diff --git a/vikunja/docker-compose.yml b/vikunja/docker-compose.yml
new file mode 100644
index 0000000..db11ae4
--- /dev/null
+++ b/vikunja/docker-compose.yml
@@ -0,0 +1,42 @@
+version: "3.8"
+
+# https://vikunja.io/docs/config-options
+# https://vikunja.io/docs/full-docker-example/
+
+volumes:
+  vikunja:
+    name: ${VIKUNJA_VOLUME_NAME:-vikunja}
+
+services:
+  vikunja_api:
+    container_name: ${VIKUNJA_CONTAINER_NAME:-vikunja}_api
+    image: ${VIKUNJA_API_IMAGE:-vikunja/api:0.18.1}
+    restart: always
+    environment:
+      VIKUNJA_SERVICE_JWTSECRET: ${VIKUNJA_SERVICE_JWTSECRET}
+      VIKUNJA_SERVICE_JWTTTL: ${VIKUNJA_SERVICE_JWTTTL:-259200}
+      VIKUNJA_SERVICE_JWTTTLLONG: ${VIKUNJA_SERVICE_JWTTTLLONG:-2592000}
+
+      VIKUNJA_SERVICE_FRONTENDURL: ${VIKUNJA_SERVICE_FRONTENDURL:?err}
+      VIKUNJA_SERVICE_MAXITEMSPERPAGE: ${VIKUNJA_SERVICE_MAXITEMSPERPAGE:-50}
+      VIKUNJA_SERVICE_ENABLECALDAV: ${VIKUNJA_SERVICE_ENABLECALDAV:-true}
+      VIKUNJA_SERVICE_ENABLELINKSHARING: ${VIKUNJA_SERVICE_ENABLELINKSHARING:-true}
+      VIKUNJA_SERVICE_ENABLEREGISTRATION: ${VIKUNJA_SERVICE_ENABLEREGISTRATION:-true}
+      VIKUNJA_SERVICE_ENABLETASKATTACHMENTS: ${VIKUNJA_SERVICE_ENABLETASKATTACHMENTS:-true}
+      VIKUNJA_SERVICE_TIMEZONE: ${VIKUNJA_SERVICE_TIMEZONE:-GMT}
+      VIKUNJA_SERVICE_ENABLETASKCOMMENTS: ${VIKUNJA_SERVICE_ENABLETASKCOMMENTS:-true}
+      VIKUNJA_SERVICE_ENABLETOTP: ${VIKUNJA_SERVICE_ENABLETOTP:-true}
+      VIKUNJA_SERVICE_ENABLEEMAILREMINDERS: ${VIKUNJA_SERVICE_ENABLEEMAILREMINDERS:-true}
+      VIKUNJA_SERVICE_ENABLEUSERDELETION: ${VIKUNJA_SERVICE_ENABLEUSERDELETION:-true}
+
+      VIKUNJA_FILES_BASEPATH: ${VIKUNJA_FILES_BASEPATH:-./files}
+      VIKUNJA_FILES_MAXSIZE: ${VIKUNJA_FILES_MAXSIZE:-20MB}
+      PUID: ${VIKUNJA_PUID:-1000}
+      PGID: ${VIKUNJA_PGID:-1000}
+    volumes:
+      - vikunja:/app/vikunja/files
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+  vikunja_frontend:
+    container_name: ${VIKUNJA_CONTAINER_NAME:-vikunja}_frontend
+    image: ${VIKUNJA_FRONTEND_IMAGE:-vikunja/frontend:0.18.2}
-- 
2.40.1


From cfc0771bb5dacab647e32961c3269da4185202b8 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Tue, 12 Jul 2022 10:23:14 +0200
Subject: [PATCH 22/43] docs(Registry): Add command to clean registry

---
 registry/README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/registry/README.md b/registry/README.md
index a644b38..56deffa 100644
--- a/registry/README.md
+++ b/registry/README.md
@@ -36,6 +36,12 @@ Pour se connecter :
 docker login https://$REGISTRY_DOMAIN
 ```
 
+## Nettoyer le registre
+
+```sh
+docker exec registry bin/registry garbage-collect /etc/docker/registry/config.yml --delete-untagged=true
+```
+
 ## Aide
 
 Pour connaître les images du registry :
-- 
2.40.1


From 912fe146af88a95ecd5553d8f614cf95b1773ffd Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Tue, 29 Nov 2022 22:55:55 +0100
Subject: [PATCH 23/43] feat(listmonk): Add new service

---
 README.md                   |  1 +
 listmonk/.env               | 26 ++++++++++++++++++++++++
 listmonk/README.md          | 37 ++++++++++++++++++++++++++++++++++
 listmonk/docker-compose.yml | 40 +++++++++++++++++++++++++++++++++++++
 4 files changed, 104 insertions(+)
 create mode 100644 listmonk/.env
 create mode 100644 listmonk/README.md
 create mode 100644 listmonk/docker-compose.yml

diff --git a/README.md b/README.md
index f3ee893..348c871 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@ Vous trouverez dans ce dépôt l'ensemble des services Open Source que RésiLien
 
 - [Directus](./directus) : Permet d'administrer une base de données
 - [HedgeDoc](./hedgedoc) : Prise de note en Markdown collaborative en temps réel
+- [listmonk](./listmonk) : Gestionnaire de listes de diffusion et de newsletter
 - [Mobilizon](./mobilizon): Permet l'organisation d'évènements et de gestion de groupes
 - [Nextcloud](./nextcloud) : Site d'hébergement de fichiers et une plateforme de collaboration
 - [Plausible](./plausible) : Plausible est une plateforme d'analyse Web légère et open source
diff --git a/listmonk/.env b/listmonk/.env
new file mode 100644
index 0000000..0dea747
--- /dev/null
+++ b/listmonk/.env
@@ -0,0 +1,26 @@
+########
+# DOCKER
+
+#DOCKER_CONTEXT=
+#DOCKER_HOST=
+SERVICES_DIR=..
+COMPOSE_FILE=${SERVICES_DIR}/listmonk/docker-compose.yml:${SERVICES_DIR}/postgres/docker-compose.yml
+#COMPOSE_PROJECT_NAME=
+
+## APP
+
+LISTMONK_DOMAIN=localhost
+LISTMONK_ADMIN_USERNAME=
+LISTMONK_ADMIN_PASSWORD=
+#LISTMONK_CONTAINER_NAME=listmonk
+#LISTMONK_VOLUME_NAME=listmonk
+#LISTMONK_IMAGE=listmonk/listmonk:v2.3.0
+
+## POSTGRES
+
+#POSTGRES_VOLUME_NAME=
+#POSTGRES_CONTAINER_NAME=
+#POSTGRES_IMAGE=
+POSTGRES_USER=listmonk
+POSTGRES_PASSWORD=listmonk
+POSTGRES_DB=listmonk
diff --git a/listmonk/README.md b/listmonk/README.md
new file mode 100644
index 0000000..50c403a
--- /dev/null
+++ b/listmonk/README.md
@@ -0,0 +1,37 @@
+# listmonk
+
+> Gestionnaire de listes de diffusion et de newsletter
+
+## Documentation
+
+listmonk ne gère actuellement pas le multicompte.
+
+Pour utiliser avec une configuration avec les variables d'environnements il faut la commande suivante :
+
+```
+command: [sh, -c, "./listmonk --config ''"]
+```
+
+Pour l'installation il faut lancer la commande suivante pour initialiser la base de donnée :
+
+```
+command: [sh, -c, "yes | ./listmonk --install --config '' && ./listmonk --config ''"]
+```
+
+Pour faire les mise à jour et ainsi migrer la base de donnée :
+
+```
+command: [sh, -c, "yes | ./listmonk --upgrade --config '' && ./listmonk --config ''"]
+```
+
+## Liens
+
+- [Site Officiel][site]
+- [Documentation][documentation]
+- [Code source][source]
+- [Docker Hub][dockerhub]
+
+[site]: https://listmonk.app/
+[source]: https://github.com/knadh/listmonk
+[documentation]: https://listmonk.app/docs/
+[dockerhub]: https://hub.docker.com/r/listmonk/listmonk
diff --git a/listmonk/docker-compose.yml b/listmonk/docker-compose.yml
new file mode 100644
index 0000000..9732d9a
--- /dev/null
+++ b/listmonk/docker-compose.yml
@@ -0,0 +1,40 @@
+version: "3.8"
+
+networks:
+  default:
+    name: ${TRAEFIK_NETWORK_NAME:-traefik}
+
+volumes:
+  listmonk:
+    name: ${LISTMONK_VOLUME_NAME:-listmonk}
+
+services:
+  listmonk:
+    container_name: ${LISTMONK_CONTAINER_NAME:-listmonk}
+    image: ${LISTMONK_IMAGE:-listmonk/listmonk:v2.3.0}
+    restart: always
+    #command: [sh, -c, "yes | ./listmonk --install --config '' && ./listmonk --config ''"]
+    #command: [sh, -c, "yes | ./listmonk --upgrade --config '' && ./listmonk --config ''"]
+    command: [sh, -c, "./listmonk --config ''"]
+    depends_on:
+      - postgres
+    environment:
+      LISTMONK_app__address: 0.0.0.0:9000
+      LISTMONK_app__admin_username: ${LISTMONK_ADMIN_USERNAME:?err}
+      LISTMONK_app__admin_password: ${LISTMONK_ADMIN_PASSWORD:?err}
+      LISTMONK_db__host: ${POSTGRES_CONTAINER_NAME:?err}
+      LISTMONK_db__port: 5432
+      LISTMONK_db__user: ${POSTGRES_USER:?err}
+      LISTMONK_db__password: ${POSTGRES_PASSWORD:?err}
+      LISTMONK_db__database: ${POSTGRES_DB:?err}
+      LISTMONK_db__ssl_mode: disable
+      TZ: Europe/Paris
+    volumes:
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+      - listmonk:/listmonk/uploads
+    labels:
+      - traefik.enable=true
+      - traefik.docker.network=${TRAEFIK_NETWORK_NAME:-traefik}
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-listmonk}.rule=Host(`${LISTMONK_DOMAIN:?err}`)
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-listmonk}.entrypoints=${TRAEFIK_ENTRYPOINTS:-web}
-- 
2.40.1


From cae7eafbe05361d5b572d57fc95029823d4c9b97 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Fri, 9 Dec 2022 21:12:55 +0100
Subject: [PATCH 24/43] feat(Uptime Kuma): Add new service

---
 README.md                             |  3 ++-
 uptimekuma/README.md                  | 21 +++++++++++++++++++++
 uptimekuma/docker-compose.local.yml   |  8 ++++++++
 uptimekuma/docker-compose.traefik.yml | 15 +++++++++++++++
 uptimekuma/docker-compose.yml         | 17 +++++++++++++++++
 5 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 uptimekuma/README.md
 create mode 100644 uptimekuma/docker-compose.local.yml
 create mode 100644 uptimekuma/docker-compose.traefik.yml
 create mode 100644 uptimekuma/docker-compose.yml

diff --git a/README.md b/README.md
index 348c871..f3dcd8f 100644
--- a/README.md
+++ b/README.md
@@ -19,13 +19,14 @@ Vous trouverez dans ce dépôt l'ensemble des services Open Source que RésiLien
 - [ClickHouse](./clickhouse) : Un logiciel libre de base de données orientée colonnes pour le traitement analytique en ligne
 - [Drone](./drone) : Un service d'intégration continue
 - [GeoIP Update](./geoipupdate) : Permet de télécharger la base de données GeoIP2 permettant de localiser les IPs
-- [Gitea](./gitea) : Un service Git auto-hébergé très simple à installer et à utiliser. Il est similaire à GitHub, Bitbucket ou Gitlab.
+- [Gitea](./gitea) : Un service Git très simple à installer et à utiliser. Il est similaire à GitHub, Bitbucket ou Gitlab.
 - [Grafana](./grafana) : Un outil de supervision simple et élégant
 - [PostgreSQL](./postgres) : PostgreSQL est un système de gestion de base de données relationnelle et objet.
 - [Prometheus](./prometheus) : Un logiciel de surveillance informatique
 - [Redis](./redis) : Système de gestion de base de données clé-valeur extensible, très hautes performances
 - [Registry Docker](./registry) : Une application qui permet de distribuer des images Docker
 - [Traefik](./traefik) : Traefik, un reverse-proxy pour vos conteneurs
+- [Uptime Kuma](./uptimekuma) : outil de surveillance de site ou service WEB
 - [Watchtower](./watchtower) : Automatiser la mise à jour d'image docker
 
 ## Comment ça marche ?
diff --git a/uptimekuma/README.md b/uptimekuma/README.md
new file mode 100644
index 0000000..1d1a56f
--- /dev/null
+++ b/uptimekuma/README.md
@@ -0,0 +1,21 @@
+# Uptime Kuma
+
+> Uptime Kuma est un service pour surveiller des applications et services auto-hébergés. Il surveille le fonctionnement de services à travers des sondes HTTP(S), TCP, Ping, enregistrement DNS… sans limites.
+
+## Information
+
+- L'ensemble des variables d'environnement se trouve [ici](https://github.com/louislam/uptime-kuma/wiki/Environment-Variables)
+- Actuellement Uptime Kuma support seulement sqlite3, [une PR](https://github.com/louislam/uptime-kuma/pull/1139) est en court pour le support de MySQL à suivre.
+- Il y aurait des problèmes de DNS avec l'image Docker Alpine et [le support ne sera plus la dans la v2](https://github.com/louislam/uptime-kuma/pull/2085) donc on prend la version debian un peu plus lourde.
+
+## Liens
+
+- [Site Officiel][site]
+- [Documentation][documentation]
+- [Code source][source]
+- [Docker Hub][dockerhub]
+
+[site]: https://uptime.kuma.pet/
+[source]: https://github.com/louislam/uptime-kuma
+[documentation]: https://github.com/louislam/uptime-kuma/wiki
+[dockerhub]: https://hub.docker.com/r/louislam/uptime-kuma/
\ No newline at end of file
diff --git a/uptimekuma/docker-compose.local.yml b/uptimekuma/docker-compose.local.yml
new file mode 100644
index 0000000..7a90473
--- /dev/null
+++ b/uptimekuma/docker-compose.local.yml
@@ -0,0 +1,8 @@
+---
+
+version: "3.8"
+
+services:
+  uptimekuma:
+    ports:
+      - 3001:3001
diff --git a/uptimekuma/docker-compose.traefik.yml b/uptimekuma/docker-compose.traefik.yml
new file mode 100644
index 0000000..ff7d31c
--- /dev/null
+++ b/uptimekuma/docker-compose.traefik.yml
@@ -0,0 +1,15 @@
+---
+
+version: "3.8"
+
+networks:
+  default:
+    name: ${TRAEFIK_NETWORK_NAME:-traefik}
+
+services:
+  uptimekuma:
+    labels:
+      - traefik.enable=true
+      - traefik.docker.network=${TRAEFIK_NETWORK_NAME:-traefik}
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-uptimekuma}.rule=Host(`${UPTIMEKUMA_DOMAIN:?err}`)
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-uptimekuma}.entrypoints=${TRAEFIK_ENTRYPOINTS:-web}
diff --git a/uptimekuma/docker-compose.yml b/uptimekuma/docker-compose.yml
new file mode 100644
index 0000000..8a087de
--- /dev/null
+++ b/uptimekuma/docker-compose.yml
@@ -0,0 +1,17 @@
+---
+
+version: "3.8"
+
+volumes:
+  uptimekuma:
+    name: ${UPTIMEKUMA_VOLUME_NAME:-uptimekuma}
+
+services:
+  uptimekuma:
+    container_name: ${UPTIMEKUMA_CONTAINER_NAME:-uptimekuma}
+    image: ${UPTIMEKUMA_IMAGE:-louislam/uptime-kuma:1.18.5}
+    restart: always
+    volumes:
+      - uptimekuma:/app/data
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
-- 
2.40.1


From c9ef1d34a107f67c88aa69f3a05fca8ae07639b6 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Fri, 9 Dec 2022 22:12:23 +0100
Subject: [PATCH 25/43] feat(Uptime Kuma): Add documentation and default .env

---
 uptimekuma/.env      | 20 ++++++++++++++++++++
 uptimekuma/README.md |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 uptimekuma/.env

diff --git a/uptimekuma/.env b/uptimekuma/.env
new file mode 100644
index 0000000..a67d401
--- /dev/null
+++ b/uptimekuma/.env
@@ -0,0 +1,20 @@
+########
+# DOCKER
+
+SERVICES_DIR=".."
+COMPOSE_FILE=${SERVICES_DIR}/uptimekuma/docker-compose.yml:${SERVICES_DIR}/uptimekuma/docker-compose.local.yml
+# COMPOSE_PROJECT_NAME=
+
+## APP
+
+# UPTIMEKUMA_DOMAIN={{ UPTIMEKUMA_DOMAIN }}
+UPTIMEKUMA_CONTAINER_NAME=uptimekuma
+UPTIMEKUMA_VOLUME_NAME=uptimekuma
+# UPTIMEKUMA_IMAGE=
+
+#########
+# TRAEFIK
+
+# TRAEFIK_NETWORK_NAME=
+# TRAEFIK_ROUTER_NAME=
+# TRAEFIK_ENTRYPOINTS=
diff --git a/uptimekuma/README.md b/uptimekuma/README.md
index 1d1a56f..0505ee5 100644
--- a/uptimekuma/README.md
+++ b/uptimekuma/README.md
@@ -7,6 +7,7 @@
 - L'ensemble des variables d'environnement se trouve [ici](https://github.com/louislam/uptime-kuma/wiki/Environment-Variables)
 - Actuellement Uptime Kuma support seulement sqlite3, [une PR](https://github.com/louislam/uptime-kuma/pull/1139) est en court pour le support de MySQL à suivre.
 - Il y aurait des problèmes de DNS avec l'image Docker Alpine et [le support ne sera plus la dans la v2](https://github.com/louislam/uptime-kuma/pull/2085) donc on prend la version debian un peu plus lourde.
+- Pour l'instant [il n'est pas possible d'avoir plusieurs comptes](https://github.com/louislam/uptime-kuma/issues/128)
 
 ## Liens
 
-- 
2.40.1


From 747d158f583ea04fc834f3030b23e47086d79431 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Sat, 31 Dec 2022 14:35:36 +0100
Subject: [PATCH 26/43] feat(Vaultwarden): Add new service

---
 README.md                               |  1 +
 vaultwarden/.env                        | 46 +++++++++++++++++++++++++
 vaultwarden/README.md                   | 21 +++++++++++
 vaultwarden/docker-compose.postgres.yml |  8 +++++
 vaultwarden/docker-compose.smtp.yml     | 15 ++++++++
 vaultwarden/docker-compose.traefik.yml  | 15 ++++++++
 vaultwarden/docker-compose.yml          | 23 +++++++++++++
 7 files changed, 129 insertions(+)
 create mode 100644 vaultwarden/.env
 create mode 100644 vaultwarden/README.md
 create mode 100644 vaultwarden/docker-compose.postgres.yml
 create mode 100644 vaultwarden/docker-compose.smtp.yml
 create mode 100644 vaultwarden/docker-compose.traefik.yml
 create mode 100644 vaultwarden/docker-compose.yml

diff --git a/README.md b/README.md
index f3dcd8f..065f41f 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ Vous trouverez dans ce dépôt l'ensemble des services Open Source que RésiLien
 - [Mobilizon](./mobilizon): Permet l'organisation d'évènements et de gestion de groupes
 - [Nextcloud](./nextcloud) : Site d'hébergement de fichiers et une plateforme de collaboration
 - [Plausible](./plausible) : Plausible est une plateforme d'analyse Web légère et open source
+- [Vaultwarden](./vaultwarden) : Gestionnaire de mot de passe compatible avec Bitwarden
 - [Vikunja](./vikunja) : L'application pour organiser sa vie
 
 ### Pour les devs / ops
diff --git a/vaultwarden/.env b/vaultwarden/.env
new file mode 100644
index 0000000..0c01add
--- /dev/null
+++ b/vaultwarden/.env
@@ -0,0 +1,46 @@
+########
+# DOCKER
+
+SERVICES_DIR=".."
+COMPOSE_FILE=${SERVICES_DIR}/vaultwarden/docker-compose.yml
+#COMPOSE_PROJECT_NAME=
+
+## APP
+
+#VAULTWARDEN_IMAGE=
+#VAULTWARDEN_VOLUME_NAME=
+VAULTWARDEN_DOMAIN=vaultwarden.local
+
+#VAULTWARDEN_LOG_LEVEL=
+#VAULTWARDEN_SIGNUPS_ALLOWED=false
+VAULTWARDEN_ADMIN_TOKEN="mytoken"
+#VAULTWARDEN_INVITATION_ORG_NAME="RésiLien"
+
+##########
+# POSTGRES
+
+#POSTGRES_IMAGE=
+#POSTGRES_CONTAINER_NAME=
+#POSTGRES_DB=
+#POSTGRES_USER=
+#POSTGRES_PASSWORD=
+#POSTGRES_VOLUME_NAME=
+
+######
+# SMTP
+
+#VAULTWARDEN_SMTP_HOST=
+#VAULTWARDEN_SMTP_FROM=
+#VAULTWARDEN_SMTP_FROM_NAME=
+#VAULTWARDEN_SMTP_SECURITY=
+#VAULTWARDEN_SMTP_PORT=
+#VAULTWARDEN_SMTP_USERNAME=
+#VAULTWARDEN_SMTP_PASSWORD=
+#VAULTWARDEN_SMTP_AUTH_MECHANISM=
+
+#########
+# TRAEFIK
+
+#TRAEFIK_NETWORK_NAME=
+#TRAEFIK_ROUTER_NAME=
+#TRAEFIK_ENTRYPOINTS=
diff --git a/vaultwarden/README.md b/vaultwarden/README.md
new file mode 100644
index 0000000..b799a9d
--- /dev/null
+++ b/vaultwarden/README.md
@@ -0,0 +1,21 @@
+# Vaultwarden
+
+> Gestionnaire de mot de passe compatible avec Bitwarden mais écrit en Rust pour être plus sobre en ressource système.
+
+## Configuration
+
+Toutes les variables de configuration du service sont disponibles à [cette adresse](https://github.com/dani-garcia/vaultwarden/blob/main/.env.template).
+
+## Clients
+
+[Les clients de Bitwarden](https://bitwarden.com/#download) sont compatibles avec le serveur.
+
+## Liens
+
+- [Documentation][documentation]
+- [Code source][source]
+- [Docker Hub][dockerhub]
+
+[source]: https://github.com/dani-garcia/vaultwarden
+[documentation]: https://github.com/dani-garcia/vaultwarden/wiki
+[dockerhub]: https://hub.docker.com/r/vaultwarden/server
\ No newline at end of file
diff --git a/vaultwarden/docker-compose.postgres.yml b/vaultwarden/docker-compose.postgres.yml
new file mode 100644
index 0000000..49fc448
--- /dev/null
+++ b/vaultwarden/docker-compose.postgres.yml
@@ -0,0 +1,8 @@
+---
+
+version: "3.8"
+
+services:
+  vaultwarden:
+    environment:
+      DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_CONTAINER_NAME}:5432/${POSTGRES_DB}
\ No newline at end of file
diff --git a/vaultwarden/docker-compose.smtp.yml b/vaultwarden/docker-compose.smtp.yml
new file mode 100644
index 0000000..21ca579
--- /dev/null
+++ b/vaultwarden/docker-compose.smtp.yml
@@ -0,0 +1,15 @@
+---
+
+version: "3.8"
+
+services:
+  vaultwarden:
+    environment:
+      SMTP_HOST: ${VAULTWARDEN_SMTP_HOST:?err}
+      SMTP_FROM: ${VAULTWARDEN_SMTP_FROM:?err}
+      SMTP_FROM_NAME: ${VAULTWARDEN_SMTP_FROM_NAME:?err}
+      SMTP_SECURITY: ${VAULTWARDEN_SMTP_SECURITY:?err}
+      SMTP_PORT: ${VAULTWARDEN_SMTP_PORT:?err}
+      SMTP_USERNAME: ${VAULTWARDEN_SMTP_USERNAME:?err}
+      SMTP_PASSWORD: ${VAULTWARDEN_SMTP_PASSWORD:?err}
+      SMTP_AUTH_MECHANISM: ${VAULTWARDEN_SMTP_AUTH_MECHANISM:?err}
diff --git a/vaultwarden/docker-compose.traefik.yml b/vaultwarden/docker-compose.traefik.yml
new file mode 100644
index 0000000..e191542
--- /dev/null
+++ b/vaultwarden/docker-compose.traefik.yml
@@ -0,0 +1,15 @@
+---
+
+version: "3.8"
+
+networks:
+  default:
+    name: ${TRAEFIK_NETWORK_NAME:-traefik}
+
+services:
+  vaultwarden:
+    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}.entrypoints=${TRAEFIK_ENTRYPOINTS:-web}
\ No newline at end of file
diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml
new file mode 100644
index 0000000..59cbb88
--- /dev/null
+++ b/vaultwarden/docker-compose.yml
@@ -0,0 +1,23 @@
+---
+
+version: "3.8"
+
+volumes:
+  vaultwarden:
+    name: ${VAULTWARDEN_VOLUME_NAME:-vaultwarden}
+
+services:
+  vaultwarden:
+    image:  ${VAULTWARDEN_CONTAINER_NAME:-vaultwarden/server:1.27.0-alpine}
+    container_name: vaultwarden
+    restart: always
+    depends_on:
+      - postgres
+    environment:
+      ADMIN_TOKEN: ${VAULTWARDEN_ADMIN_TOKEN:?err}
+      DOMAIN: https://${VAULTWARDEN_DOMAIN:?err}
+      INVITATION_ORG_NAME: ${VAULTWARDEN_INVITATION_ORG_NAME:-Vaultwarden}
+      LOG_LEVEL: ${VAULTWARDEN_LOG_LEVEL:-Info}
+      SIGNUPS_ALLOWED: ${VAULTWARDEN_SIGNUPS_ALLOWED:-true}
+    volumes:
+      - vaultwarden:/data
-- 
2.40.1


From c631f47ae10f59f88a20e4fd3ad734fab65a1b5c Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Sat, 31 Dec 2022 15:14:20 +0100
Subject: [PATCH 27/43] feat(Vaultwarden): Add timezone information

---
 vaultwarden/docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml
index 59cbb88..288e328 100644
--- a/vaultwarden/docker-compose.yml
+++ b/vaultwarden/docker-compose.yml
@@ -21,3 +21,5 @@ services:
       SIGNUPS_ALLOWED: ${VAULTWARDEN_SIGNUPS_ALLOWED:-true}
     volumes:
       - vaultwarden:/data
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
-- 
2.40.1


From 62334b2f85be93643752909f352135e9e938ffb4 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Sat, 31 Dec 2022 15:22:32 +0100
Subject: [PATCH 28/43] feat(Vaultwarden): Ajout de la variable pour configurer
 le nom du service

---
 vaultwarden/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml
index 288e328..07b34db 100644
--- a/vaultwarden/docker-compose.yml
+++ b/vaultwarden/docker-compose.yml
@@ -9,7 +9,7 @@ volumes:
 services:
   vaultwarden:
     image:  ${VAULTWARDEN_CONTAINER_NAME:-vaultwarden/server:1.27.0-alpine}
-    container_name: vaultwarden
+    container_name: ${VAULTWARDEN_CONTAINER_NAME:-vaultwarden}
     restart: always
     depends_on:
       - postgres
-- 
2.40.1


From 4bf479d0e0dcea45ef1c6c0c44fa7f635e51de38 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Sat, 31 Dec 2022 15:24:38 +0100
Subject: [PATCH 29/43] feat(Vaultwarden): Move postgres dependency on postgres
 file

---
 vaultwarden/docker-compose.postgres.yml | 4 +++-
 vaultwarden/docker-compose.yml          | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vaultwarden/docker-compose.postgres.yml b/vaultwarden/docker-compose.postgres.yml
index 49fc448..58e2bf7 100644
--- a/vaultwarden/docker-compose.postgres.yml
+++ b/vaultwarden/docker-compose.postgres.yml
@@ -4,5 +4,7 @@ version: "3.8"
 
 services:
   vaultwarden:
+    depends_on:
+      - postgres
     environment:
-      DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_CONTAINER_NAME}:5432/${POSTGRES_DB}
\ No newline at end of file
+      DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_CONTAINER_NAME}:5432/${POSTGRES_DB}
diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml
index 07b34db..c2ca4a1 100644
--- a/vaultwarden/docker-compose.yml
+++ b/vaultwarden/docker-compose.yml
@@ -11,8 +11,6 @@ services:
     image:  ${VAULTWARDEN_CONTAINER_NAME:-vaultwarden/server:1.27.0-alpine}
     container_name: ${VAULTWARDEN_CONTAINER_NAME:-vaultwarden}
     restart: always
-    depends_on:
-      - postgres
     environment:
       ADMIN_TOKEN: ${VAULTWARDEN_ADMIN_TOKEN:?err}
       DOMAIN: https://${VAULTWARDEN_DOMAIN:?err}
-- 
2.40.1


From 4e32136c261a82b26ed6284d946992843cca9919 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Sat, 31 Dec 2022 15:28:28 +0100
Subject: [PATCH 30/43] fix(Vaultwarden): Update image variable name

---
 vaultwarden/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml
index c2ca4a1..97553ca 100644
--- a/vaultwarden/docker-compose.yml
+++ b/vaultwarden/docker-compose.yml
@@ -8,7 +8,7 @@ volumes:
 
 services:
   vaultwarden:
-    image:  ${VAULTWARDEN_CONTAINER_NAME:-vaultwarden/server:1.27.0-alpine}
+    image:  ${VAULTWARDEN_IMAGE:-vaultwarden/server:1.27.0-alpine}
     container_name: ${VAULTWARDEN_CONTAINER_NAME:-vaultwarden}
     restart: always
     environment:
-- 
2.40.1


From 0af258dcaedc6eccf175d141cea6c2424903039f Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Tue, 3 Jan 2023 21:08:06 +0100
Subject: [PATCH 31/43] feat(Nextcloud): SMTP configuration should not be empty

---
 nextcloud/docker-compose.smtp.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nextcloud/docker-compose.smtp.yml b/nextcloud/docker-compose.smtp.yml
index b8a880f..6343eed 100644
--- a/nextcloud/docker-compose.smtp.yml
+++ b/nextcloud/docker-compose.smtp.yml
@@ -3,11 +3,11 @@ version: "3.8"
 services:
   nextcloud-fpm:
     environment:
-      SMTP_HOST: ${SMTP_HOST?err} # The hostname of the SMTP server.
+      SMTP_HOST: ${SMTP_HOST:?err} # The hostname of the SMTP server.
       SMTP_SECURE: ${SMTP_SECURE:-ssl} # Set to ssl to use SSL, or tls to use STARTTLS.
       SMTP_PORT: ${SMTP_PORT:-465}
       SMTP_AUTHTYPE: ${SMTP_AUTHTYPE:-LOGIN}
-      SMTP_NAME: ${SMTP_NAME?err}
-      SMTP_PASSWORD: ${SMTP_PASSWORD?err}
-      MAIL_FROM_ADDRESS: ${MAIL_FROM_ADDRESS}
-      MAIL_DOMAIN: ${MAIL_DOMAIN}
+      SMTP_NAME: ${SMTP_NAME:?err}
+      SMTP_PASSWORD: ${SMTP_PASSWORD:?err}
+      MAIL_FROM_ADDRESS: ${MAIL_FROM_ADDRESS:?err}
+      MAIL_DOMAIN: ${MAIL_DOMAIN:?err}
-- 
2.40.1


From fd63036294583b7698dcc3e4a7a9281b8b9811cf Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Tue, 3 Jan 2023 21:08:48 +0100
Subject: [PATCH 32/43] feat(Nextcloud): Add all configuration on cron
 container

---
 nextcloud/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index 909e536..5e06ef4 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -17,6 +17,7 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     environment:
+      &fpm-configuration
       NEXTCLOUD_TRUSTED_DOMAINS: ${NEXTCLOUD_TRUSTED_DOMAINS?err}
       NEXTCLOUD_ADMIN_USER: ${NEXTCLOUD_ADMIN_USER?err}
       NEXTCLOUD_ADMIN_PASSWORD: ${NEXTCLOUD_ADMIN_PASSWORD?err}
@@ -53,8 +54,7 @@ services:
       - nextcloud-web
     entrypoint: /cron.sh
     environment:
-      PUID: ${NEXTCLOUD_PUID:-1000}
-      PGID: ${NEXTCLOUD_PGID:-1000}
+      <<: *fpm-configuration
     volumes:
       - nextcloud:/var/www/html
       - /etc/timezone:/etc/timezone:ro
-- 
2.40.1


From 2281c4337c8088f5b6506b5aa05b6b22a6e32ed0 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Tue, 3 Jan 2023 21:09:37 +0100
Subject: [PATCH 33/43] feat(Nextcloud): Update web folder path with generic
 SERVICES_DIR

---
 nextcloud/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index 5e06ef4..f32a9f0 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -33,7 +33,7 @@ services:
 
   nextcloud-web:
     container_name: ${NEXTCLOUD_CONTAINER_NAME:-nextcloud}-web
-    build: web
+    build: ${SERVICES_DIR}/nextcloud/web
     restart: always
     environment:
       NEXTCLOUD_FPM_CONTAINER_NAME: ${NEXTCLOUD_CONTAINER_NAME:-nextcloud}-fpm
-- 
2.40.1


From 0198c030e93e459329c0901d35ef7e990c5bdaed Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Tue, 3 Jan 2023 21:20:13 +0100
Subject: [PATCH 34/43] feat(Nextcloud): Add environment variables to configure
 server

---
 nextcloud/.env                      |  2 +-
 nextcloud/docker-compose.config.yml | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 nextcloud/docker-compose.config.yml

diff --git a/nextcloud/.env b/nextcloud/.env
index 8cd5d60..15a8d09 100644
--- a/nextcloud/.env
+++ b/nextcloud/.env
@@ -4,7 +4,7 @@
 #DOCKER_CONTEXT=
 #DOCKER_HOST=
 SERVICES_DIR=..
-COMPOSE_FILE=${SERVICES_DIR}/nextcloud/docker-compose.yml:${SERVICES_DIR}/nextcloud/docker-compose.local.yml:${SERVICES_DIR}/postgres/docker-compose.yml:${SERVICES_DIR}/redis/docker-compose.yml
+COMPOSE_FILE=${SERVICES_DIR}/nextcloud/docker-compose.yml:${SERVICES_DIR}/nextcloud/docker-compose.config.yml:${SERVICES_DIR}/nextcloud/docker-compose.local.yml:${SERVICES_DIR}/postgres/docker-compose.yml:${SERVICES_DIR}/redis/docker-compose.yml
 #COMPOSE_PROJECT_NAME=
 
 ## APP
diff --git a/nextcloud/docker-compose.config.yml b/nextcloud/docker-compose.config.yml
new file mode 100644
index 0000000..f7491ce
--- /dev/null
+++ b/nextcloud/docker-compose.config.yml
@@ -0,0 +1,21 @@
+---
+version: "3.8"
+
+services:
+  nextcloud-fpm:
+    environment:
+      &nextcloud-configuration
+      NC_trashbin_retention_obligation: ${NC_trashbin_retention_obligation:-auto, 30}
+      NC_force_language: ${NC_force_language:-fr}
+      NC_default_locale: ${NC_default_locale:-fr_FR}
+      NC_force_locale: ${NC_force_locale:-fr_FR}
+      NC_default_language: ${NC_default_language:-fr}
+      NC_default_phone_region: ${NC_default_phone_region:-FR}
+      NC_defaultapp: ${NC_defaultapp:-files}
+      NC_preview_max_x: ${NC_preview_max_x:-2048}
+      NC_preview_max_y: ${NC_preview_max_y:-2048}
+      NC_jpeg_quality: ${NC_jpeg_quality:-60}
+
+  nextcloud-cron:
+    environment:
+      <<: *nextcloud-configuration
-- 
2.40.1


From b3dce58f7b18d24f18856e18875df1267d3611a8 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Tue, 3 Jan 2023 21:47:02 +0100
Subject: [PATCH 35/43] feat(Nextcloud): Update SMTP environment variables

---
 nextcloud/docker-compose.smtp.yml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/nextcloud/docker-compose.smtp.yml b/nextcloud/docker-compose.smtp.yml
index 6343eed..60136d8 100644
--- a/nextcloud/docker-compose.smtp.yml
+++ b/nextcloud/docker-compose.smtp.yml
@@ -3,11 +3,16 @@ version: "3.8"
 services:
   nextcloud-fpm:
     environment:
-      SMTP_HOST: ${SMTP_HOST:?err} # The hostname of the SMTP server.
-      SMTP_SECURE: ${SMTP_SECURE:-ssl} # Set to ssl to use SSL, or tls to use STARTTLS.
-      SMTP_PORT: ${SMTP_PORT:-465}
-      SMTP_AUTHTYPE: ${SMTP_AUTHTYPE:-LOGIN}
-      SMTP_NAME: ${SMTP_NAME:?err}
-      SMTP_PASSWORD: ${SMTP_PASSWORD:?err}
-      MAIL_FROM_ADDRESS: ${MAIL_FROM_ADDRESS:?err}
-      MAIL_DOMAIN: ${MAIL_DOMAIN:?err}
+      &smtp-configuration
+      NC_mail_smtphost: ${NC_mail_smtphost:?err} # The hostname of the SMTP server.
+      NC_mail_smtpsecure: ${NC_mail_smtpsecure:-ssl} # Set to ssl to use SSL, or tls to use STARTTLS.
+      NC_mail_smtpport: ${NC_mail_smtpport:-465}
+      NC_mail_smtpauthtype: ${NC_mail_smtpauthtype:-LOGIN}
+      NC_mail_smtpname: ${NC_mail_smtpname:?err}
+      NC_mail_smtppassword: ${NC_mail_smtppassword:?err}
+      NC_mail_from_address: ${NC_mail_from_address:?err}
+      NC_mail_domain: ${NC_mail_domain:?err}
+
+  nextcloud-cron:
+    environment:
+      <<: *smtp-configuration
-- 
2.40.1


From b54891ec38af9bb4557acea97792fc1c752f68fd Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Tue, 3 Jan 2023 22:01:55 +0100
Subject: [PATCH 36/43] chore(Nginx): Upgrade to 1.23.3

---
 nextcloud/web/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nextcloud/web/Dockerfile b/nextcloud/web/Dockerfile
index 2cde763..345321a 100644
--- a/nextcloud/web/Dockerfile
+++ b/nextcloud/web/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginx:1.21.5-alpine
+FROM nginx:1.23.3-alpine
 
 COPY nextcloud.conf.template /etc/nginx/templates/default.conf.template
-- 
2.40.1


From 669866b44e45dbbd36d7121d34c211b758c538df Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Tue, 3 Jan 2023 22:10:29 +0100
Subject: [PATCH 37/43] docs(Nextcloud): Add environment variables
 documentation

---
 nextcloud/README.md | 83 +++++++++++++++++++++++++++++++--------------
 1 file changed, 58 insertions(+), 25 deletions(-)

diff --git a/nextcloud/README.md b/nextcloud/README.md
index 2f04a15..0aca8d8 100644
--- a/nextcloud/README.md
+++ b/nextcloud/README.md
@@ -14,45 +14,78 @@ On peut trouver [la documentation ici][documentation] en anglais ou ici pour la
 
 ## Aide
 
-Exemple de commande :
+Commande pour se connecter à un serveur :
 
 ```sh
-docker exec --user www-data -it nextcloud bash
+. .env
+docker exec --user www-data -it ${NEXTCLOUD_CONTAINER_NAME}-fpm ash
+```
 
-docker-compose exec --user www-data nextcloud php occ db:add-missing-primary-keys
+Pour mettre un site en maintenance :
+
+```sh
+. .env
+docker exec --user www-data -it ${NEXTCLOUD_CONTAINER_NAME}-fpm php occ maintenance:mode --on
 ```
 
 ## Configuration
 
-Il est possible de configurer certaines parties avec des variables d'environnement, mais ce n'est pas le cas de l'ensemble de la configuration.
+Il est possible de configurer certaines parties avec des variables d'environnement :
+- Soit les variables sont spécifique à l'image Docker 
+- soit avec des variables du type `NC_` + clé (exemple : NC_default_phone_region=FR)
 
-Voici les modifications que j'effectue :
+### Création d'un groupe
 
 ```
-docker-compose exec --user www-data nextcloud-fpm ash
-vi config/config.php
-```
-Ajout de la configuration suivante :
-```
-  'default_language' => 'fr',
-  'default_locale' => 'fr_FR',
-  'default_phone_region' => 'FR',
-  'defaultapp' => 'files',
-  'preview_max_x' => 2048,
-  'preview_max_y' => 2048,
-  'jpeg_quality' => 60,
+export NC_GROUP=com-en-aubrac
+php occ group:add $NC_GROUP
 ```
 
-Ajout de imagemagick :
-```
-docker-compose exec nextcloud-fpm apk add --no-cache imagemagick
-```
-
-ou
+### Création d'un utilisateur
 
 ```
-ssh <server>
-docker exec nextcloud-fpm apk add --no-cache imagemagick
+# La variable OC_PASS est spécifique pour l'utilisation de --password-from-env
+export OC_PASS=unmotdepasse!
+
+export NC_USER=simon
+export NC_NAME=Simon
+export NC_MAIL=simon@example.org
+export NC_QUOTA="180 GB"
+
+php occ user:add --password-from-env --display-name=$NC_NAME --group="$NC_GROUP" $NC_USER
+php occ user:setting $NC_USER settings email $NC_MAIL
+```
+
+### Quota
+
+Pour bien comprendre les quotas dans Nextcloud : https://docs.nextcloud.com/server/latest/user_manual/en/files/quota.html
+
+```
+export NC_USER=simon
+export NC_QUOTA="10 GB"
+php occ user:setting $NC_USER files quota "$NC_QUOTA"
+```
+
+### imagemagick
+
+> Le module php-imagick n’a aucun support SVG dans cette instance. Pour une meilleure compatibilité, il est recommandé de l’installer.
+
+Pour résoudre ce problème il faut ajouter le paquet `imagemagick`
+
+```
+. .env
+docker exec -it ${NEXTCLOUD_CONTAINER_NAME}-fpm apk add --no-cache imagemagick
+```
+
+## Application
+
+Suppression d'application :
+
+```
+php occ app:disable dashboard
+php occ app:disable photos
+php occ app:disable weather_status
+php occ app:disable user_status
 ```
 
 ## PHP-FPM: remédier à server reached pm.max_children
-- 
2.40.1


From 264688abf82d2460677c8aa239767186bd3595d0 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Tue, 3 Jan 2023 22:11:02 +0100
Subject: [PATCH 38/43] feat(Nextcloud): Remove run script

---
 nextcloud/run | 49 -------------------------------------------------
 1 file changed, 49 deletions(-)
 delete mode 100755 nextcloud/run

diff --git a/nextcloud/run b/nextcloud/run
deleted file mode 100755
index a98ccba..0000000
--- a/nextcloud/run
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-. $DIR/../help.sh
-. $DIR/../postgres/run --only-source
-
-nextcloud_help() {
-  echo "./run backup    : Lancement de la sauvegarde de Nextcloud"
-  echo "./run restore   : Restauration de la sauvegarde de Nextcloud"
-}
-
-nextcloud_backup() {
-  script_env
-  BACKUP_DATE_DEFAULT=`date +%Y%m%d_%H%M%S`
-  BACKUP_DATE=${BACKUP_DATE:-$BACKUP_DATE_DEFAULT}
-  backup_folder_create
-
-  POSTGRES_BACKUP_FILE=backups/${BACKUP_DATE}_${NEXTCLOUD_DOMAIN}_postgres.sql
-  docker-compose exec --user www-data nextcloud php occ maintenance:mode --on
-  postgres_backup
-
-  docker run -it --rm -v $HOME/backups/${NEXTCLOUD_DOMAIN}:/backup --volumes-from nextcloud alpine:3.12.3 ash -c "cd /var/www/html && tar cvf /backup/${BACKUP_DATE}_${NEXTCLOUD_DOMAIN}_files.tar ."
-  docker-compose exec --user www-data nextcloud php occ maintenance:mode --off
-}
-
-nextcloud_restore() {
-  script_env
-
-  postgres_restore
-  docker run -it --rm -v $HOME/backups/${NEXTCLOUD_DOMAIN}:/backup -v nextcloud:/var/www/html alpine:3.12.3 ash -c "cd /var/www/html && tar xvf /backup/${BACKUP_DATE}_${NEXTCLOUD_DOMAIN}_files.tar --strip 1"
-}
-
-if [ $# -ge 1 ]; then
-  if [ "${1}" == "backup" ]; then
-    script_start
-    nextcloud_backup
-    script_end
-  elif [ "${1}" == "restore" ]; then
-    script_start
-    nextcloud_restore
-    script_end
-  elif [ "${1}" != "--only-source" ]; then
-    nextcloud_help
-  fi
-else
-  nextcloud_help
-fi
-- 
2.40.1


From e3dcc0efd516663dadaeaaa5f95f17e225e32e4b Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Tue, 3 Jan 2023 22:15:37 +0100
Subject: [PATCH 39/43] chore(Nextcloud): Upgrade to 25.0.2

https://nextcloud.com/changelog/#25-0-2
---
 nextcloud/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index f32a9f0..351eb38 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -7,7 +7,7 @@ volumes:
 services:
   nextcloud-fpm:
     container_name: ${NEXTCLOUD_CONTAINER_NAME:-nextcloud}-fpm
-    image: ${NEXTCLOUD_IMAGE:-nextcloud:23.0.3-fpm-alpine}
+    image: ${NEXTCLOUD_IMAGE:-nextcloud:25.0.2-fpm-alpine}
     restart: always
     depends_on:
       - postgres
@@ -47,7 +47,7 @@ services:
       - /etc/localtime:/etc/localtime:ro
 
   nextcloud-cron:
-    image: ${NEXTCLOUD_IMAGE:-nextcloud:22.2.3-fpm-alpine}
+    image: ${NEXTCLOUD_IMAGE:-nextcloud:25.0.2-fpm-alpine}
     container_name: ${NEXTCLOUD_CONTAINER_NAME:-nextcloud}-cron
     restart: always
     depends_on:
-- 
2.40.1


From de2a8eef465956b8b26f9d29778740431f22fca2 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Thu, 2 Feb 2023 12:59:09 +0100
Subject: [PATCH 40/43] feat(Vikunja): Restart container & explicite dependency

---
 vikunja/docker-compose.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vikunja/docker-compose.yml b/vikunja/docker-compose.yml
index db11ae4..ac99c02 100644
--- a/vikunja/docker-compose.yml
+++ b/vikunja/docker-compose.yml
@@ -40,3 +40,6 @@ services:
   vikunja_frontend:
     container_name: ${VIKUNJA_CONTAINER_NAME:-vikunja}_frontend
     image: ${VIKUNJA_FRONTEND_IMAGE:-vikunja/frontend:0.18.2}
+    restart: always
+    depends_on:
+      - vikunja_api
-- 
2.40.1


From ba29719ed102a7569b4da5d7b196d414dbc12b74 Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Thu, 2 Feb 2023 16:50:59 +0100
Subject: [PATCH 41/43] feat(Traefik): Pilot is deprecated

https://traefik.io/blog/announcing-traefik-proxy-2-8/
---
 traefik/docker-compose.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml
index 651a062..f030402 100644
--- a/traefik/docker-compose.yml
+++ b/traefik/docker-compose.yml
@@ -30,7 +30,6 @@ services:
       - --log.level=${TRAEFIK_LOG_LEVEL:-INFO}
       - --global.sendanonymoususage=${TRAEFIK_GLOBAL_SENDANONYMOUSUSAGE:-false}
       - --global.checknewversion=${TRAEFIK_GLOBAL_CHECKNEWVERSION:-false}
-      - --pilot.dashboard=${TRAEFIK_PILOT_DASHBOARD:-false}
       - --metrics.prometheus=${TRAEFIK_METRICS_PROMETHEUS:-true}
       - --accesslog=${TRAEFIK_ACCESSLOG:-false}
 
-- 
2.40.1


From e8a022e7e3f4de32385ff2f7b15b84cb30aa345f Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Tue, 21 Feb 2023 11:58:06 +0100
Subject: [PATCH 42/43] feat(Gitea): Upgrade to 1.19 and update configuration

---
 gitea/docker-compose.smtp.yml    | 11 +++++++----
 gitea/docker-compose.traefik.yml | 12 +++++-------
 gitea/docker-compose.yml         | 20 ++++++++++++--------
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/gitea/docker-compose.smtp.yml b/gitea/docker-compose.smtp.yml
index fa37a1a..f01131d 100644
--- a/gitea/docker-compose.smtp.yml
+++ b/gitea/docker-compose.smtp.yml
@@ -4,9 +4,12 @@ services:
   gitea:
     environment:
       - GITEA__mailer__ENABLED=true
-      - GITEA__mailer__FROM=${GITEA__mailer__FROM:?GITEA__mailer__FROM not set}
-      - GITEA__mailer__MAILER_TYPE=smtp
-      - GITEA__mailer__HOST=${GITEA__mailer__HOST:?GITEA__mailer__HOST not set}
-      - GITEA__mailer__IS_TLS_ENABLED=true
+      - GITEA__mailer__PROTOCOL=${GITEA__mailer__PROTOCOL:-smtp}
+      - GITEA__mailer__SMTP_ADDR=${GITEA__mailer__SMTP_ADDR:?GITEA__mailer__SMTP_ADDR not set}
+      - GITEA__mailer__SMTP_PORT=${GITEA__mailer__SMTP_PORT:?GITEA__mailer__SMTP_PORT not set}
+
       - GITEA__mailer__USER=${GITEA__mailer__USER:?GITEA__mailer__USER not set}
       - GITEA__mailer__PASSWD="""${GITEA__mailer__PASSWD:?GITEA__mailer__PASSWD not set}"""
+
+      - GITEA__mailer__FROM=${GITEA__mailer__FROM:?GITEA__mailer__FROM not set}
+      - GITEA__mailer__HOST=${GITEA__mailer__HOST:?GITEA__mailer__HOST not set}
diff --git a/gitea/docker-compose.traefik.yml b/gitea/docker-compose.traefik.yml
index b4b8447..f3a5562 100644
--- a/gitea/docker-compose.traefik.yml
+++ b/gitea/docker-compose.traefik.yml
@@ -7,10 +7,8 @@ networks:
 services:
   gitea:
     labels:
-      traefik.enable: 'true'
-      traefik.docker.network: ${TRAEFIK_NETWORK_NAME:-traefik}
-
-      traefik.http.routers.gitea.rule: 'Host(`${GITEA_DOMAIN:?err}`)'
-      traefik.http.routers.gitea.entrypoints: 'web'
-
-      traefik.http.services.gitea.loadbalancer.server.port: '3000'
+      - traefik.enable=true
+      - traefik.docker.network=${TRAEFIK_NETWORK_NAME:-traefik}
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-gitea}.rule=Host(`${GITEA_DOMAIN:?err}`)
+      - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-gitea}.entrypoints=${TRAEFIK_ENTRYPOINTS:-web}
+      - traefik.http.services.${TRAEFIK_ROUTER_NAME:-gitea}.loadbalancer.server.port=3000
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index a2ae51c..67eb748 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -7,16 +7,20 @@ volumes:
 services:
   gitea:
     container_name: ${GITEA_CONTAINER_NAME:-gitea}
-    image: ${GITEA_IMAGE:-gitea/gitea:1.16.5}
+    image: ${GITEA_IMAGE:-gitea/gitea:1.18.4}
     restart: always
     environment:
-      # - USER_UID=1000
-      # - USER_GID=1000
-      DB_TYPE: postgres
-      DB_HOST: ${POSTGRES_CONTAINER_NAME:-postgres}:5432 # Default name is same as ../postgres/docker-compose.yml:8
-      DB_NAME: ${POSTGRES_DB}
-      DB_USER: ${POSTGRES_USER}
-      DB_PASSWD: ${POSTGRES_PASSWORD}
+      - USER_UID=${GITEA_UID:-1000}
+      - USER_GID=${GITEA_GID:-1000}
+      # Database
+      - GITEA__database__DB_TYPE=postgres
+      - GITEA__database__HOST=${POSTGRES_CONTAINER_NAME:-postgres}:5432
+      - GITEA__database__NAME=${POSTGRES_DB}
+      - GITEA__database__USER=${POSTGRES_USER}
+      - GITEA__database__PASSWD=${POSTGRES_PASSWORD}
+      # Security
+      - GITEA__security__SECRET_KEY=${GITEA_SECRET_KEY:-}
+      - GITEA__security__INTERNAL_TOKEN=${GITEA_INTERNAL_TOKEN:-}
     volumes:
       - gitea:/data
       - /etc/timezone:/etc/timezone:ro
-- 
2.40.1


From 8f5fcec3a9bf8684eae5fee31f476790f63470cd Mon Sep 17 00:00:00 2001
From: Simon C <simonc@linux.com>
Date: Tue, 21 Feb 2023 12:44:00 +0100
Subject: [PATCH 43/43] feat(Gitea): Update configuration

---
 gitea/.env                    | 36 +++++++++++++++++++++--------------
 gitea/docker-compose.smtp.yml |  1 -
 gitea/docker-compose.yml      |  6 ++++--
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/gitea/.env b/gitea/.env
index 3db8400..2b34046 100644
--- a/gitea/.env
+++ b/gitea/.env
@@ -1,26 +1,34 @@
-COMPOSE_FILE=../postgres/docker-compose.yml:./docker-compose.yml:./docker-compose.override.yml
+########
+# DOCKER
 
-# APP
+SERVICES_DIR=".."
+COMPOSE_FILE=${SERVICES_DIR}/gitea/docker-compose.yml:${SERVICES_DIR}/gitea/docker-compose.traefik.yml:${SERVICES_DIR}/gitea/docker-compose.smtp.yml:${SERVICES_DIR}/gitea/docker-compose.metrics.yml:${SERVICES_DIR}/postgres/docker-compose.yml
+COMPOSE_PROJECT_NAME=$GITEA_DOMAIN
 
-GITEA_VOLUME_NAME=gitea
-GITEA_PROTOCOL=http
-GITEA_DOMAIN=gitea.lan
-
-# APP CONFIG
+#######
+# GITEA
 # https://docs.gitea.io/en-us/install-with-docker/#environments-variables
 
-DISABLE_SSH=true
-RUN_MODE=prod
-ROOT_URL=${GITEA_PROTOCOL}://${GITEA_DOMAIN}
-DISABLE_REGISTRATION=true
-DISABLE_GRAVATAR=true
-#INSTALL_LOCK=true
+GITEA_DOMAIN=gitea.lan
+GITEA_VOLUME_NAME=gitea
+GITEA_IMAGE=gitea/gitea:1.18.4
+GITEA_PROTOCOL=http
+GITEA_SECRET_KEY=kt5UdK0m9lI9MDyhVOFEB5jk7VwFynDyaxcUjEJUpWJBrC6FyH4dkUDKLYEa7hGn
+GITEA_INTERNAL_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE2NzY5NzkxMzZ9.Iopu6DBUhglmNPzEyYylfmTmEUpYLHYEsNrm50GoBkU
+
+# SMTP
+
+GITEA__mailer__FROM='"Name" <email@example.com>'
+GITEA__mailer__SMTP_ADDR=smtp.gitea.lan
+GITEA__mailer__SMTP_PORT=465
+GITEA__mailer__USER=gitea.lan
+GITEA__mailer__PASSWD=gitea.lan
 
 # DATABASE
-# Voir la description ../postgres/README.md
 
 POSTGRES_USER=user-example
 POSTGRES_PASSWORD=password-example
 POSTGRES_DB=postgres-database-name-example
 POSTGRES_CONTAINER_NAME=gitea-postgres
 POSTGRES_VOLUME_NAME=gitea-postgres
+POSTGRES_IMAGE=postgres:15.2-alpine
diff --git a/gitea/docker-compose.smtp.yml b/gitea/docker-compose.smtp.yml
index f01131d..af25854 100644
--- a/gitea/docker-compose.smtp.yml
+++ b/gitea/docker-compose.smtp.yml
@@ -12,4 +12,3 @@ services:
       - GITEA__mailer__PASSWD="""${GITEA__mailer__PASSWD:?GITEA__mailer__PASSWD not set}"""
 
       - GITEA__mailer__FROM=${GITEA__mailer__FROM:?GITEA__mailer__FROM not set}
-      - GITEA__mailer__HOST=${GITEA__mailer__HOST:?GITEA__mailer__HOST not set}
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index 67eb748..f30608b 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -19,8 +19,10 @@ services:
       - GITEA__database__USER=${POSTGRES_USER}
       - GITEA__database__PASSWD=${POSTGRES_PASSWORD}
       # Security
-      - GITEA__security__SECRET_KEY=${GITEA_SECRET_KEY:-}
-      - GITEA__security__INTERNAL_TOKEN=${GITEA_INTERNAL_TOKEN:-}
+      # docker run -it --rm gitea/gitea:1 gitea generate secret SECRET_KEY
+      - GITEA__security__SECRET_KEY=${GITEA_SECRET_KEY}
+      # docker run -it --rm  gitea/gitea:1 gitea generate secret INTERNAL_TOKEN
+      - GITEA__security__INTERNAL_TOKEN=${GITEA_INTERNAL_TOKEN}
     volumes:
       - gitea:/data
       - /etc/timezone:/etc/timezone:ro
-- 
2.40.1