From 59d1530cc03094f16b0a905aa4dd5223e4dfcaad Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Sun, 27 Nov 2022 09:15:16 +0100
Subject: [PATCH] Merge POP3_ADDRESS into IMAP_ADDRESS

---
 core/admin/mailu/internal/nginx.py       |  2 +-
 core/admin/run_dev.sh                    | 11 +++++++----
 core/base/libs/socrate/socrate/system.py | 18 +++++++++---------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/core/admin/mailu/internal/nginx.py b/core/admin/mailu/internal/nginx.py
index 3a5dedeb..d2f19595 100644
--- a/core/admin/mailu/internal/nginx.py
+++ b/core/admin/mailu/internal/nginx.py
@@ -129,7 +129,7 @@ def get_server(protocol, authenticated=False):
     if protocol == "imap":
         hostname, port = app.config['IMAP_ADDRESS'], 143
     elif protocol == "pop3":
-        hostname, port = app.config['POP3_ADDRESS'], 110
+        hostname, port = app.config['IMAP_ADDRESS'], 110
     elif protocol == "smtp":
         if authenticated:
             hostname, port = app.config['SMTP_ADDRESS'], 10025
diff --git a/core/admin/run_dev.sh b/core/admin/run_dev.sh
index cf05fba3..947ad873 100755
--- a/core/admin/run_dev.sh
+++ b/core/admin/run_dev.sh
@@ -75,12 +75,15 @@ ENV \
     DEBUG_ASSETS="/app/static" \
     DEBUG_TB_INTERCEPT_REDIRECTS=False \
     \
-    IMAP_ADDRESS="127.0.0.1" \
-    POP3_ADDRESS="127.0.0.1" \
-    AUTHSMTP_ADDRESS="127.0.0.1" \
+    ADMIN_ADDRESS="127.0.0.1" \
+    FRONT_ADDRESS="127.0.0.1" \
     SMTP_ADDRESS="127.0.0.1" \
+    IMAP_ADDRESS="127.0.0.1" \
     REDIS_ADDRESS="127.0.0.1" \
-    WEBMAIL_ADDRESS="127.0.0.1"
+    ANTIVIRUS_ADDRESS="127.0.0.1" \
+    ANTISPAM_ADDRESS="127.0.0.1" \
+    WEBMAIL_ADDRESS="127.0.0.1" \
+    WEBDAV_ADDRESS="127.0.0.1"
 
 CMD ["/bin/bash", "-c", "flask db upgrade &>/dev/null && flask mailu admin '${DEV_ADMIN/@*}' '${DEV_ADMIN#*@}' '${DEV_PASSWORD}' --mode ifmissing >/dev/null; flask --debug run --host=0.0.0.0 --port=8080"]
 EOF
diff --git a/core/base/libs/socrate/socrate/system.py b/core/base/libs/socrate/socrate/system.py
index 8dfdb5fe..68f44b90 100644
--- a/core/base/libs/socrate/socrate/system.py
+++ b/core/base/libs/socrate/socrate/system.py
@@ -17,15 +17,15 @@ def resolve_hostname(hostname):
         raise e
 
 SERVICE = {
-    "ADMIN": "admin",
-    "FRONT": "front",
-    "SMTP": "smtp",
-    "IMAP": "imap",
-    "REDIS": "redis",
-    "ANTIVIRUS:": "antivirus",
-    "ANTISPAM": "antispam",
-    "WEBMAIL": "webmail",
-    "WEBDAV": "webdav",
+    'ADMIN': 'admin',
+    'FRONT': 'front',
+    'SMTP': 'smtp',
+    'IMAP': 'imap',
+    'REDIS': 'redis',
+    'ANTIVIRUS:': 'antivirus',
+    'ANTISPAM': 'antispam',
+    'WEBMAIL': 'webmail',
+    'WEBDAV': 'webdav',
 }
 def set_env(required_secrets=[]):
     """ This will set all the environment variables and retains only the secrets we need """