From b367a72397576a01fd46a241a07034543f4ea82e Mon Sep 17 00:00:00 2001
From: Johannes Christ <jc@jchri.st>
Date: Sun, 1 Sep 2024 13:58:53 +0200
Subject: Swap saslauthd to mount outside of postfix

Closes #474.
---
 ansible/roles/jitsi/meta/main.yml       | 1 +
 ansible/roles/jitsi/tasks/ldap_auth.yml | 2 +-
 ansible/roles/sasl/defaults/main.yml    | 2 ++
 ansible/roles/sasl/tasks/main.yml       | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 ansible/roles/sasl/defaults/main.yml

(limited to 'ansible')

diff --git a/ansible/roles/jitsi/meta/main.yml b/ansible/roles/jitsi/meta/main.yml
index 44652ee..b8041bd 100644
--- a/ansible/roles/jitsi/meta/main.yml
+++ b/ansible/roles/jitsi/meta/main.yml
@@ -2,3 +2,4 @@
 dependencies:
   - nftables
   - nginx
+  - sasl
diff --git a/ansible/roles/jitsi/tasks/ldap_auth.yml b/ansible/roles/jitsi/tasks/ldap_auth.yml
index 2362da9..771d632 100644
--- a/ansible/roles/jitsi/tasks/ldap_auth.yml
+++ b/ansible/roles/jitsi/tasks/ldap_auth.yml
@@ -66,7 +66,7 @@
     content: |
       pwcheck_method: saslauthd
       mech_list: PLAIN
-      saslauthd_path: /var/spool/postfix/var/run/saslauthd/mux
+      saslauthd_path: "{{ sasl_mux_path }}/mux"
   tags:
     - role::jitsi
 
diff --git a/ansible/roles/sasl/defaults/main.yml b/ansible/roles/sasl/defaults/main.yml
new file mode 100644
index 0000000..0970fd6
--- /dev/null
+++ b/ansible/roles/sasl/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+sasl_mux_path: /var/run/saslauthd
diff --git a/ansible/roles/sasl/tasks/main.yml b/ansible/roles/sasl/tasks/main.yml
index 0b94a86..7f72260 100644
--- a/ansible/roles/sasl/tasks/main.yml
+++ b/ansible/roles/sasl/tasks/main.yml
@@ -55,7 +55,7 @@
     # Postfix runs in a CHROOT so we need to create the SASLAUTHD socket there
     # to allow Postfix to communicate with it.
     - key: OPTIONS
-      value: "-c -m /var/spool/postfix/var/run/saslauthd"
+      value: "-c -m {{ sasl_mux_path }}"
   tags:
     - role::sasl
   notify:
-- 
cgit v1.2.3