From c7803ca7b2ecf1ff2392a82fc7ff6ebceb1e1d3d Mon Sep 17 00:00:00 2001
From: Viyurz <viyurz@viyurz.fr>
Date: Fri, 24 May 2024 23:14:59 +0200
Subject: [PATCH] Update Stalwart mail server to v0.8.1 from v0.7.3

---
 env.yml                                        | 2 +-
 roles/mailserver/tasks/setup.yml               | 2 +-
 roles/mailserver/templates/config.toml         | 2 --
 roles/mailserver/templates/docker-compose.yaml | 3 ++-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/env.yml b/env.yml
index 390e934..e24f900 100644
--- a/env.yml
+++ b/env.yml
@@ -118,7 +118,7 @@ users:
   hedgedoc: 1004
   homepage: 8686
   lldap: 1007
-  mailserver: 8 # Do not change
+  mailserver: 8
   postgres: 70
   searxng: 977
   searxng_redis: 999
diff --git a/roles/mailserver/tasks/setup.yml b/roles/mailserver/tasks/setup.yml
index 85b0e1b..647e701 100644
--- a/roles/mailserver/tasks/setup.yml
+++ b/roles/mailserver/tasks/setup.yml
@@ -47,6 +47,6 @@
   file:
     path: "/etc/letsencrypt/live/mail.{{ domain }}/privkey.pem"
     owner: root
-    group: "{{ host_uid }}"
+    group: "{{ users['mailserver'] + uid_shift }}"
     mode: '640'
   become: true
diff --git a/roles/mailserver/templates/config.toml b/roles/mailserver/templates/config.toml
index 2793ef0..862a969 100644
--- a/roles/mailserver/templates/config.toml
+++ b/roles/mailserver/templates/config.toml
@@ -9,8 +9,6 @@ server.http.permissive-cors = false
 server.http.url = "protocol + '://' + key_get('default', 'hostname') + ':' + local_port"
 server.http.use-x-forwarded = true
 server.max-connections = 8192
-server.run-as.group = "mail"
-server.run-as.user = "mail"
 server.socket.backlog = 1024
 server.socket.nodelay = true
 server.socket.reuse-addr = true
diff --git a/roles/mailserver/templates/docker-compose.yaml b/roles/mailserver/templates/docker-compose.yaml
index 499171d..0b6bbe8 100644
--- a/roles/mailserver/templates/docker-compose.yaml
+++ b/roles/mailserver/templates/docker-compose.yaml
@@ -1,8 +1,9 @@
 services:  
   mailserver:
-    image: docker.io/stalwartlabs/mail-server:v0.7.3
+    image: docker.io/stalwartlabs/mail-server:v0.8.1
     container_name: mailserver
     restart: always
+    user: "{{ users['mailserver'] }}:{{ users['mailserver'] }}"
     networks:
       - mailserver
     ports: