From d31daae00cf418ff7fbc9be2d6290f2532297a8b Mon Sep 17 00:00:00 2001
From: Stephane de Labrusse <stephdl@de-labrusse.fr>
Date: Wed, 13 Dec 2023 17:02:42 +0100
Subject: [PATCH] todo

---
 Notes                                         |  6 ++--
 README.md                                     | 12 ++++----
 imageroot/actions/configure-module/10EnvSOGo  |  2 ++
 imageroot/actions/create-module/20Env-default |  3 +-
 imageroot/actions/get-configuration/20read    | 14 +++++++++
 imageroot/bin/expand-configuration            |  1 -
 imageroot/systemd/user/sogo-app.service       |  3 +-
 imageroot/templates/sogo.conf                 | 30 +++++++++----------
 8 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/Notes b/Notes
index dc98b22..b35d11f 100644
--- a/Notes
+++ b/Notes
@@ -192,7 +192,7 @@ sogo         142  0.0  0.0 406040  3860 ?        Ssl  22:59   0:00 /usr/bin/memc
 
 
 
-api-cli run configure-module --agent module/sogo4 --data - <<EOF
+api-cli run configure-module --agent module/sogo6 --data - <<EOF
 {
 "mail_server": "f38f9911-8341-452e-8941-d889385a59a8",
 "ldap_domain": "ad.rocky9-pve4.org",
@@ -202,7 +202,9 @@ api-cli run configure-module --agent module/sogo4 --data - <<EOF
   "lets_encrypt": false,
   "host": "sogo3.rocky9-pve4.org",
   "workers_count": 3,
-  "auxiliary_account": true
+  "auxiliary_account": true,
+  "active_sync": true,
+  "dav": true
 }
 EOF
 
diff --git a/README.md b/README.md
index 0047db2..ff3fb23 100644
--- a/README.md
+++ b/README.md
@@ -53,14 +53,16 @@ Example:
 api-cli run configure-module --agent module/sogo1 --data - <<EOF
 {
 "mail_server": "f38f9911-8341-452e-8941-d889385a59a8",
-"ldap_domain": "ad.foo.com",
-"admin_users" : "admin,administrator",
-"mail_domain": "foo.com",
+"ldap_domain": "ad.rocky9-pve4.org",
+"admin_users" : "Administrator",
+"mail_domain": "rocky9-pve4.org",
   "http2https": true,
   "lets_encrypt": false,
-  "host": "roundcubemail.domain.com",
+  "host": "sogo3.rocky9-pve4.org",
   "workers_count": 3,
-  "auxiliary_account": true
+  "auxiliary_account": true,
+  "active_sync": true,
+  "dav": true
 }
 EOF
 
diff --git a/imageroot/actions/configure-module/10EnvSOGo b/imageroot/actions/configure-module/10EnvSOGo
index 4ebffb7..219eb8c 100755
--- a/imageroot/actions/configure-module/10EnvSOGo
+++ b/imageroot/actions/configure-module/10EnvSOGo
@@ -20,3 +20,5 @@ agent.set_env("LDAP_DOMAIN", data["ldap_domain"])
 agent.set_env("MAIL_DOMAIN",data.get("mail_domain",""))
 agent.set_env("WOWORKERSCOUNT",data.get("workers_count","3"))
 agent.set_env("AUXILIARYACCOUNT",data.get("auxiliary_account",True))
+agent.set_env("ACTIVESYNC",data.get("activesync",True))
+agent.set_env("DAV",data.get("dav",True))
diff --git a/imageroot/actions/create-module/20Env-default b/imageroot/actions/create-module/20Env-default
index e141c81..a488a74 100755
--- a/imageroot/actions/create-module/20Env-default
+++ b/imageroot/actions/create-module/20Env-default
@@ -20,7 +20,6 @@ if not timezone:
 
 # Create default vars
 agent.set_env("ACTIVESYNC", True)
-agent.set_env("CUSTOMEMAILFIELD", "userPrincipalName")
 agent.set_env("DAV", True)
 agent.set_env("DRAFTSFOLDER", "Drafts")
 agent.set_env("SOGOFOLDERSSENDEMAILNOTIFICATIONS", "NO")
@@ -38,4 +37,4 @@ agent.set_env("SXVMEMLIMIT", "512")
 agent.set_env("TIMEZONE", timezone)
 agent.set_env("TRASHFOLDER", "Trash")
 agent.set_env("WOWATCHDOGREQUESTTIMEOUT", "60")
-agent.set_env("BACKUPTIME", "30 0")
+agent.set_env("BACKUPTIME", "#30 0")
diff --git a/imageroot/actions/get-configuration/20read b/imageroot/actions/get-configuration/20read
index c06bbad..deb87a9 100755
--- a/imageroot/actions/get-configuration/20read
+++ b/imageroot/actions/get-configuration/20read
@@ -13,6 +13,7 @@ import os
 import sys
 import json
 import agent
+from agent.ldapproxy import Ldapproxy
 
 # Prepare return variable
 config = {}
@@ -48,5 +49,18 @@ for key in agent.list_service_providers(rdb,'imap','tcp'):
 # use it inside a dropdown
 config['mail_server_URL'] = modules
 
+# retrieve LDAP domains list
+lp = Ldapproxy()
+domains = []
+for key in lp.get_domains_list():
+    domains.append({
+        "name": key,
+        "label": key,
+        "value": key,
+    })
+
+config['user_domains_list'] = domains
+
+
 # Dump the configuration to stdout
 json.dump(config, fp=sys.stdout)
diff --git a/imageroot/bin/expand-configuration b/imageroot/bin/expand-configuration
index e2970a6..6894aab 100755
--- a/imageroot/bin/expand-configuration
+++ b/imageroot/bin/expand-configuration
@@ -41,7 +41,6 @@ properties = {
     "auxiliary_account": 'YES' if os.environ['AUXILIARYACCOUNT'] == 'True' else 'NO',
     "active_sync": True if os.environ['ACTIVESYNC'] == 'True' else False,
     "dav": True if os.environ['DAV'] == 'True' else False,
-    "customemailfield": os.environ['CUSTOMEMAILFIELD'],
     "draftsfolder": os.environ['DRAFTSFOLDER'],
     "sogofolderssendemailnotifications": os.environ['SOGOFOLDERSSENDEMAILNOTIFICATIONS'],
     "sogoaclssendemailnotifications": os.environ['SOGOACLSSENDEMAILNOTIFICATIONS'],
diff --git a/imageroot/systemd/user/sogo-app.service b/imageroot/systemd/user/sogo-app.service
index c90ccb7..66ec26a 100644
--- a/imageroot/systemd/user/sogo-app.service
+++ b/imageroot/systemd/user/sogo-app.service
@@ -16,7 +16,7 @@ EnvironmentFile=-%S/state/discovery_ldap.env
 WorkingDirectory=%S/state
 Restart=always
 TimeoutStopSec=70
-ExecStartPre=/bin/mkdir -p config
+ExecStartPre=/usr/bin/bash -c "/bin/mkdir -p {config,backups}"
 ExecStartPre=/bin/rm -f %t/sogo-app.pid %t/sogo-app.ctr-id
 ExecStartPre=/usr/local/bin/runagent discover-ldap
 ExecStartPre=/usr/local/bin/runagent discover-service
@@ -30,6 +30,7 @@ ExecStart=/usr/bin/podman run --conmon-pidfile %t/sogo-app.pid \
     --volume ./config/cron-sogo:/etc/cron.d/cron-sogo:Z \
     --volume ./config/sieve.creds:/etc/sogo/sieve.creds:Z \
     --volume ./config/SOGo.conf:/etc/httpd/conf/extra/SOGo.conf:Z \
+    --volume ./backups:/etc/sogo/backups:Z \
     --env=SOGO_* \
     ${SOGO_IMAGE}
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/sogo-app.ctr-id -t 10
diff --git a/imageroot/templates/sogo.conf b/imageroot/templates/sogo.conf
index 5a6e64b..c791046 100644
--- a/imageroot/templates/sogo.conf
+++ b/imageroot/templates/sogo.conf
@@ -33,7 +33,7 @@
   {% if ldap_schema == 'ad' %}
   /* 45 AD authentication */
     SOGoUserSources =(
-     { 
+     {
         id = AD_Users;
         type = ldap;
         CNFieldName = displayName;
@@ -46,14 +46,13 @@
         baseDN = "{{ldap_base}}";
         bindFields = (
                 sAMAccountName,
-                {{customemailfield}}
-            );
+        );
         hostname = ldap://10.0.2.2:{{ldap_port}};
         filter = "(objectClass='user') AND (sAMAccountType=805306368)";
-        MailFieldNames = ("{{customemailfield}}");
+        //MailFieldNames = ("userPrincipalName");
         scope = SUB;
         displayName = "{{mail_domain}} users";
-        isAddressBook = YES;
+        isAddressBook = NO;
      },
      {
         id = AD_Groups;
@@ -67,10 +66,10 @@
         baseDN = "{{ldap_base}}";
         hostname = ldap://10.0.2.2:{{ldap_port}};
         filter = "(objectClass='group') AND (sAMAccountType=268435456)";
-        MailFieldNames = ("mail");
+        //MailFieldNames = ("mail");
         scope = SUB;
         displayName = "{{mail_domain}} groups";
-        isAddressBook = YES;
+        isAddressBook = NO;
      }
     );
   {% elif ldap_schema == 'rfc2307' %}
@@ -84,33 +83,32 @@
         baseDN = "{{ldap_base}}";
         bindDN = "{{ldap_user}}";
         bindPassword = "{{ldap_password}}";
-        scope = ONE;
+        scope = SUB;
         canAuthenticate = YES;
         MailFieldNames = ("mail");
         displayName = "{{mail_domain}} groups";
         hostname = ldap://10.0.2.2:{{ldap_port}};
-        isAddressBook = YES;
+        isAddressBook = NO;
      },
      {
         id = users;
         type = ldap;
-        CNFieldName = cn;
+        CNFieldName = displayName;
         UIDFieldName = uid;
-        IDFieldName = mail;
+        IDFieldName = uid;
         bindFields = (
-                mail,
                 uid
-            );
-        IMAPLoginFieldName = mail;
+        );
+        IMAPLoginFieldName = uid;
         baseDN = "{{ldap_base}}";
         bindDN = "{{ldap_user}}";
         bindPassword = "{{ldap_password}}";
-        scope = ONE;
+        scope = SUB;
         MailFieldNames = ("mail");
         canAuthenticate = YES;
         displayName = "{{mail_domain}} users";
         hostname = ldap://10.0.2.2:{{ldap_port}};
-        isAddressBook = YES;
+        isAddressBook = NO;
      }
     );
   {% endif %}