From cf66f07c4e05ff9420d0d1e4b4df648f5b768da0 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Sat, 15 Apr 2023 13:24:21 +0200
Subject: [PATCH] Upgraded mailu to version 1.9

---
 roles/docker-mailu/README.md                  |  8 +++++++
 .../templates/docker-compose.yml.j2           | 21 +++++++++++--------
 roles/docker-mailu/vars/main.yml              |  1 +
 .../templates/docker-volume-backup.service.j2 |  2 +-
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/roles/docker-mailu/README.md b/roles/docker-mailu/README.md
index b95a1b3f..3a22c6ea 100644
--- a/roles/docker-mailu/README.md
+++ b/roles/docker-mailu/README.md
@@ -55,6 +55,14 @@ How to manage users is described here: https://mailu.io/master/cli.html
   docker-compose -p mailu up -d
 ```
 ## debug
+
+## database
+### database access
+To access the database execute
+```bash
+  docker exec -it nextcloud_database_1 mysql -u nextcloud -D nextcloud -p
+```
+
 ### mailu_front_1
 
 ```bash
diff --git a/roles/docker-mailu/templates/docker-compose.yml.j2 b/roles/docker-mailu/templates/docker-compose.yml.j2
index ae097781..ccae4539 100644
--- a/roles/docker-mailu/templates/docker-compose.yml.j2
+++ b/roles/docker-mailu/templates/docker-compose.yml.j2
@@ -36,7 +36,7 @@ services:
 
   # Core services
   front:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-1.8}
+    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-{{mailu_version}}}
     restart: always
     env_file: mailu.env
     logging:
@@ -57,7 +57,7 @@ services:
       database:
         condition: service_healthy
   admin:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-1.8}
+    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-{{mailu_version}}}
     restart: always
     env_file: mailu.env
     volumes:
@@ -65,10 +65,11 @@ services:
       - "dkim:/dkim"
     depends_on:
       - front
+      - redis
     logging:
       driver: journald
   imap:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-1.8}
+    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-{{mailu_version}}}
     restart: always
     env_file: mailu.env
     volumes:
@@ -80,7 +81,7 @@ services:
       driver: journald
 
   smtp:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-1.8}
+    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-{{mailu_version}}}
     restart: always
     env_file: mailu.env
     volumes:
@@ -92,7 +93,7 @@ services:
       driver: journald
 
   antispam:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-1.8}
+    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-{{mailu_version}}}
     restart: always
     env_file: mailu.env
     volumes:
@@ -101,12 +102,14 @@ services:
       - "/etc/mailu/overrides/rspamd:/etc/rspamd/override.d"
     depends_on:
       - front
+      - redis 
+      - antivirus
     logging:
       driver: journald
 
   # Optional services
   antivirus:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}clamav:${MAILU_VERSION:-1.8}
+    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}clamav:${MAILU_VERSION:-{{mailu_version}}}
     restart: always
     env_file: mailu.env
     volumes:
@@ -115,7 +118,7 @@ services:
       driver: journald
 
   webdav:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-1.8}
+    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-{{mailu_version}}}
     restart: always
     env_file: mailu.env
     volumes:
@@ -124,7 +127,7 @@ services:
       driver: journald
 
   fetchmail:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}fetchmail:${MAILU_VERSION:-1.8}
+    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}fetchmail:${MAILU_VERSION:-{{mailu_version}}}
     restart: always
     env_file: mailu.env
     logging:
@@ -132,7 +135,7 @@ services:
 
   # Webmail
   webmail:
-    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}roundcube:${MAILU_VERSION:-1.8}
+    image: ${DOCKER_ORG:-ghcr.io/mailu}/${DOCKER_PREFIX:-}roundcube:${MAILU_VERSION:-{{mailu_version}}}
     restart: always
     env_file: mailu.env
     volumes:
diff --git a/roles/docker-mailu/vars/main.yml b/roles/docker-mailu/vars/main.yml
index 1989bbe9..0d845c4b 100644
--- a/roles/docker-mailu/vars/main.yml
+++ b/roles/docker-mailu/vars/main.yml
@@ -1 +1,2 @@
 mailu_front_container_name: "mailu-front-1"
+mailu_version: "1.9"
diff --git a/roles/native-docker-volume-backup/templates/docker-volume-backup.service.j2 b/roles/native-docker-volume-backup/templates/docker-volume-backup.service.j2
index a2f8ba9c..5f73093e 100644
--- a/roles/native-docker-volume-backup/templates/docker-volume-backup.service.j2
+++ b/roles/native-docker-volume-backup/templates/docker-volume-backup.service.j2
@@ -1,5 +1,5 @@
 [Unit]
-Description=docker volume update
+Description=docker volume backup
 OnFailure=systemd-email@%n.service
 
 [Service]