From f3a7a3b47d92a4125e811daddb790831c55436c9 Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Aug 03 2020 01:33:23 +0000
Subject: Add missing directories and nginx stuff


---

diff --git a/pillar/role/mailman3.sls b/pillar/role/mailman3.sls
index 9047165..0145462 100644
--- a/pillar/role/mailman3.sls
+++ b/pillar/role/mailman3.sls
@@ -1,7 +1,8 @@
-{% if salt['grains.get']('include_secrets', True) %}
 include:
+{% if salt['grains.get']('include_secrets', True) %}
   - secrets.role.mailman3
 {% endif %}
+  - role.common.nginx
 
 # Special config for mailman in the postfix relay
 profile:
diff --git a/salt/profile/mailman3/config.sls b/salt/profile/mailman3/config.sls
index 5a26606..241fc51 100644
--- a/salt/profile/mailman3/config.sls
+++ b/salt/profile/mailman3/config.sls
@@ -15,6 +15,16 @@ mailman_log_dir:
     - name: /var/log/mailman/
     - user: mailman
 
+mailman_lock_dir:
+  file.directory:
+    - name: /var/lock/mailman/
+    - user: mailman
+
+mailman_spool_dir:
+  file.directory:
+    - name: /var/spool/mailman/
+    - user: mailman
+
 mailman_conf_file:
   file.managed:
     - name: /etc/mailman/mailman.cfg
@@ -27,6 +37,16 @@ mailman_conf_file:
     - watch_in:
       - module: mailman_restart
 
+mailman_conf_symlink_var:
+  file.symlink:
+    - name: /var/lib/mailman/var/etc/mailman.cfg
+    - target: /etc/mailman/mailman.cfg
+
+mailman_conf_symlink_etc:
+  file.symlink:
+    - name: /etc/mailman.cfg
+    - target: /etc/mailman/mailman.cfg
+
 mailman_webui_manage_file:
   file.managed:
     - name: /var/lib/mailman_webui/manage.py
diff --git a/salt/role/mailman3.sls b/salt/role/mailman3.sls
index a2c0bd1..104f9f8 100644
--- a/salt/role/mailman3.sls
+++ b/salt/role/mailman3.sls
@@ -1,2 +1,3 @@
 include:
+  - profile.web.server.nginx
   - profile.mailman3