From 1db83edb255e15e029812a9661450cdbaa73cf9a Mon Sep 17 00:00:00 2001
From: damencho <damencho@jitsi.org>
Date: Tue, 24 Sep 2024 11:31:43 -0500
Subject: [PATCH] feat(ldap): Start and configure only if enabled.

---
 prosody/rootfs/etc/cont-init.d/10-config       | 2 +-
 prosody/rootfs/etc/services.d/10-saslauthd/run | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/prosody/rootfs/etc/cont-init.d/10-config b/prosody/rootfs/etc/cont-init.d/10-config
index e7d98c6..88c9f0a 100644
--- a/prosody/rootfs/etc/cont-init.d/10-config
+++ b/prosody/rootfs/etc/cont-init.d/10-config
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-if [[ ! -f /etc/saslauthd.conf ]]; then
+if [[ ! -f /etc/saslauthd.conf ]] && [[ "$AUTH_TYPE" == "ldap" ]]; then
   tpl /defaults/saslauthd.conf > /etc/saslauthd.conf
   mkdir -pm777 /var/run/saslauthd
   adduser prosody sasl
diff --git a/prosody/rootfs/etc/services.d/10-saslauthd/run b/prosody/rootfs/etc/services.d/10-saslauthd/run
index 75199bb..126f444 100644
--- a/prosody/rootfs/etc/services.d/10-saslauthd/run
+++ b/prosody/rootfs/etc/services.d/10-saslauthd/run
@@ -1,2 +1,8 @@
 #!/usr/bin/with-contenv bash
-exec s6-setuidgid root saslauthd -a ldap -O /etc/saslauthd.conf -c -m /var/run/saslauthd -n 5 -d
+if [[ -f /etc/saslauthd.conf ]]; then
+  exec s6-setuidgid root saslauthd -a ldap -O /etc/saslauthd.conf -c -m /var/run/saslauthd -n 5 -d
+else
+    # if saslauthd should not be started,
+    # prevent s6 from restarting this script again and again
+    s6-svc -O /var/run/s6/services/10-saslauthd
+fi