Merge pull request #112 from NethServer/sdl-7103

Load LDAP domain from config and enhance Nextcloud service management NethServer/dev#7103

imageroot/bin/setup-ldap

@@ -30,6 +30,7 @@ import sys
 import agent
 import subprocess
 from agent.ldapproxy import Ldapproxy
+import json
 
 # Execute occ command
 # It returns the process exit code and output
@@ -41,11 +42,10 @@ def occ(args):
 def set_ldap(k, v):
     return occ(["ldap:set-config", "s01", k, v])
 
-if len(sys.argv) < 2:
-    print("setup-ldap: no argument given", file=sys.stderr)
-    sys.exit(1)
+with open('config.json', 'r') as cf:
+    config = json.loads(cf.read())
+cdomain = config.get("domain")
 
-cdomain = sys.argv[1]
 commands = []
 
 if not cdomain:

imageroot/events/user-domain-changed/20configure_ldap

@@ -0,0 +1,21 @@
+#!/usr/bin/env python3
+
+#
+# Copyright (C) 2024 Nethesis S.r.l.
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+
+import json
+import sys
+import agent
+import os
+
+event = json.load(sys.stdin)
+
+config = agent.read_envfile("config.env")
+nextcloud_domain = config.get('NEXTCLOUD_DOMAIN', '')
+
+if event.get('domain') != nextcloud_domain:
+    exit(0)
+
+agent.run_helper('systemctl', '--user', '-T', 'try-restart', 'nextcloud.service').check_returncode()

imageroot/systemd/user/nextcloud-app.service

@@ -13,6 +13,7 @@ ExecStartPre=/bin/rm -f %t/nextcloud-app.pid %t/nextcloud-app.ctr-id
 ExecStartPre=-runagent discover-smarthost
 ExecStartPost=runagent wait-startup
 ExecStartPost=runagent setup-smtp
+ExecStartPost=runagent setup-ldap
 ExecStart=/usr/bin/podman run --conmon-pidfile %t/nextcloud-app.pid --cidfile %t/nextcloud-app.ctr-id --cgroups=no-conmon --pod-id-file %t/nextcloud.pod-id --replace -d --name nextcloud-app --env-file=%S/state/config.env --env-file=%S/state/smarthost.env -v nextcloud-app-data:/var/www/html -v %S/state/zzz_nethserver.conf:/usr/local/etc/php-fpm.d/zzz_nethserver.conf:z ${NEXTCLOUD_APP_IMAGE}
 ExecStop=/usr/bin/podman stop --ignore --cidfile %t/nextcloud-app.ctr-id -t 10
 ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/nextcloud-app.ctr-id