From e1866b404c60906e51ba7f9f88eba3e18599797e Mon Sep 17 00:00:00 2001
From: Jean-Yves <7360784+docjyJ@users.noreply.github.com>
Date: Sun, 2 Jun 2024 22:25:33 +0200
Subject: [PATCH 1/2] Update add admin token

Signed-off-by: Jean-Yves <7360784+docjyJ@users.noreply.github.com>
---
 community-containers/stalwart/stalwart.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/community-containers/stalwart/stalwart.json b/community-containers/stalwart/stalwart.json
index c1aa3fd5..56051574 100644
--- a/community-containers/stalwart/stalwart.json
+++ b/community-containers/stalwart/stalwart.json
@@ -47,7 +47,11 @@
             ],
             "environment": [
                 "TZ=%TIMEZONE%",
-                "NC_DOMAIN=%NC_DOMAIN%"
+                "NC_DOMAIN=%NC_DOMAIN%",
+                "ADMIN_SECRET=%STALWART_USER_PASS%"
+            ],
+            "secrets": [
+                "STALWART_USER_PASS"
             ],
             "volumes": [
                 {

From 439f3ca43dddbd42bb72f615bc501f248490b155 Mon Sep 17 00:00:00 2001
From: Jean-Yves <7360784+docjyJ@users.noreply.github.com>
Date: Thu, 6 Jun 2024 17:42:28 +0200
Subject: [PATCH 2/2] Rename env to STALWART_USER_PASS and add doc

Signed-off-by: Jean-Yves <7360784+docjyJ@users.noreply.github.com>
---
 community-containers/stalwart/readme.md     | 2 +-
 community-containers/stalwart/stalwart.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/community-containers/stalwart/readme.md b/community-containers/stalwart/readme.md
index 8f9e7895..4a8a214d 100644
--- a/community-containers/stalwart/readme.md
+++ b/community-containers/stalwart/readme.md
@@ -15,7 +15,7 @@ This container bundles stalwart mail server and auto-configures it for you.
 - You need to configure a reverse proxy in order to run this container since stalwart needs a dedicated (sub)domain! For that, you might have a look at https://github.com/nextcloud/all-in-one/tree/main/community-containers/caddy.
 - Currently, only `mail.$NC_DOMAIN` is supported as subdomain! So if Nextcloud is using `your-domain.com`, Stalwart will use `mail.your-domain.com`.
 - The data of Stalwart will be automatically included in AIOs backup solution!
-- After adding and starting the container, you need to run `docker logs nextcloud-aio-stalwart` to obtain the system administrator account and password. With this information, you can log in to the web interface at `https://mail.your-domain.com/login`
+- After adding and starting the container, you need to run `docker inspect nextcloud-aio-stalwart  | grep STALWART_USER_PASS` to obtain the system administrator password (username: `admin`). With this information, you can log in to the web interface at `https://mail.your-domain.com/login`
 - See https://stalw.art/docs/install/docker/ for next steps.
 - Additionally, you might want to install and configure [snappymail](https://apps.nextcloud.com/apps/snappymail) or [mail](https://apps.nextcloud.com/apps/mail) inside Nextcloud in order to use your mail accounts for sending and retrieving mails.
 - See https://stalw.art/docs/faq for further faq and docs on the project
diff --git a/community-containers/stalwart/stalwart.json b/community-containers/stalwart/stalwart.json
index 56051574..a70849c3 100644
--- a/community-containers/stalwart/stalwart.json
+++ b/community-containers/stalwart/stalwart.json
@@ -48,7 +48,7 @@
             "environment": [
                 "TZ=%TIMEZONE%",
                 "NC_DOMAIN=%NC_DOMAIN%",
-                "ADMIN_SECRET=%STALWART_USER_PASS%"
+                "STALWART_USER_PASS=%STALWART_USER_PASS%"
             ],
             "secrets": [
                 "STALWART_USER_PASS"