From a8f2e5932c5ca3063e36691fcd12993464efbb96 Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Aug 02 2020 23:22:27 +0000
Subject: Set up theming for mailman3


---

diff --git a/salt/profile/mailman3/config.sls b/salt/profile/mailman3/config.sls
index 5e6b6a0..b01b6dc 100644
--- a/salt/profile/mailman3/config.sls
+++ b/salt/profile/mailman3/config.sls
@@ -6,12 +6,6 @@ mailman_var_dir:
   file.directory:
     - name: /var/lib/mailman/
 
-# Preparation for when we have a set of templates for mailman core
-
-mailman_template_dir:
-  file.directory:
-    - name: /var/lib/mailman/templates/
-
 mailman_webui_dir:
   file.directory:
     - name: /var/lib/mailman_webui/
@@ -21,16 +15,6 @@ mailman_log_dir:
     - name: /var/log/mailman/
     - user: mailman
 
-# Preparation for when we have a theme for hyperkitty
-
-mailman_webui_template_dir:
-  file.directory:
-    - name: /var/lib/mailman_webui/templates/
-
-mailman_webui_static_dir:
-  file.directory:
-    - name: /var/lib/mailman_webui/static-openSUSE/
-
 mailman_conf_file:
   file.managed:
     - name: /etc/mailman/mailman.cfg
diff --git a/salt/profile/mailman3/files/uwsgi.ini b/salt/profile/mailman3/files/uwsgi.ini
index 91c4dec..e00fb26 100644
--- a/salt/profile/mailman3/files/uwsgi.ini
+++ b/salt/profile/mailman3/files/uwsgi.ini
@@ -4,6 +4,8 @@
 # Port on which uwsgi will be listening.
 uwsgi-socket = /var/lib/mailman/server.sock
 
+plugins = logfile
+
 # Move to the directory wher the django files are.
 chdir = /var/lib/mailman_webui
 
diff --git a/salt/profile/mailman3/master.sls b/salt/profile/mailman3/master.sls
new file mode 100644
index 0000000..ac8432a
--- /dev/null
+++ b/salt/profile/mailman3/master.sls
@@ -0,0 +1,18 @@
+https://github.com/openSUSE/lists-o-o.git:
+  git.latest:
+    - branch: master
+    - target: /var/lib/mailman/lists-o-o
+    - rev: master
+    - user: mailman
+
+/var/lib/mailman/templates:
+  file.symlink:
+    - target: /var/lib/mailman/lists-o-o/mailman-templates
+
+/var/lib/mailman_webui/templates:
+  file.symlink:
+    - target: /var/lib/mailman/lists-o-o/webui-templates
+
+/var/lib/mailman_webui/static-openSUSE:
+  file.symlink:
+    - target: /var/lib/mailman/lists-o-o/webui-assets