From e67fbe1c26f75bd3e085497bbd63a73c17b95267 Mon Sep 17 00:00:00 2001
From: Derek Crudgington <derek@federated.computer>
Date: Wed, 12 Feb 2025 16:49:51 +0000
Subject: [PATCH] Updated listmonk.sh to use new version and config

---
 lib/listmonk.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/listmonk.sh b/lib/listmonk.sh
index de295db..53e325e 100644
--- a/lib/listmonk.sh
+++ b/lib/listmonk.sh
@@ -43,8 +43,10 @@ networks:
 EOF
 
 cat > /federated/apps/listmonk/.env <<EOF
-IMAGE_VERSION="v2.4.0"
+IMAGE_VERSION="v4.1.0"
 TZ=Etc/UTC
+LISTMONK_ADMIN_USER=admin@$DOMAIN
+LISTMONK_ADMIN_PASSWORD=$ADMINPASS
 EOF
 
 [[ "${PLUS}" = "true" ]] && sed -i "s/letsencrypt/httpresolver/g" /federated/apps/listmonk/docker-compose.yml
@@ -53,8 +55,6 @@ if [[ "${PLUS}" = "true" ]]; then
 cat > /federated/apps/listmonk/data/listmonk/config.toml <<EOF
 [app]
 address = "0.0.0.0:9000"
-admin_username = "admin@$DOMAIN"
-admin_password = "$ADMINPASS"
 
 # Database.
 [db]
@@ -72,10 +72,7 @@ else
 cat > /federated/apps/listmonk/data/listmonk/config.toml <<EOF
 [app]
 address = "0.0.0.0:9000"
-admin_username = "admin@$DOMAIN"
-admin_password = "$ADMINPASS"
 
-# Database.
 [db]
 host = "postgresql.$DOMAIN"
 port = 5432