From 49c97731fbc15fe1e18caf432e9f21d8ecc32703 Mon Sep 17 00:00:00 2001
From: Stasiek Michalski <hellcp@opensuse.org>
Date: Aug 04 2020 02:19:30 +0000
Subject: Fix various issues with mailman3


---

diff --git a/pillar/role/mailman3.sls b/pillar/role/mailman3.sls
index 0145462..551c100 100644
--- a/pillar/role/mailman3.sls
+++ b/pillar/role/mailman3.sls
@@ -32,7 +32,11 @@ nginx:
                 - listen:
                     - 80
                     - default_server
-                - server: unix:///var/lib/mailman/server.sock
+                - location /static/:
+                  - alias: /var/lib/mailman_webui/static/
+                - location /:
+                  - include: /etc/nginx/uwsgi_params
+                  - uwsgi_pass: 0.0.0.0:8000
           enabled: True
 
 sudoers:
diff --git a/salt/profile/mailman3/files/mailman.service b/salt/profile/mailman3/files/mailman.service
index 4c0cfb6..1d37861 100644
--- a/salt/profile/mailman3/files/mailman.service
+++ b/salt/profile/mailman3/files/mailman.service
@@ -2,7 +2,7 @@
 Description=GNU Mailman Service
 
 [Service]
-Type=simple
+Type=forking
 Restart=on-failure
 RestartSec=3
 
diff --git a/salt/profile/mailman3/files/urls.py b/salt/profile/mailman3/files/urls.py
index e8bb66c..f1bedf3 100644
--- a/salt/profile/mailman3/files/urls.py
+++ b/salt/profile/mailman3/files/urls.py
@@ -26,8 +26,8 @@ urlpatterns = [
     url(r'^$', RedirectView.as_view(
         url=reverse_lazy('list_index'),
         permanent=True)),
-    url(r'^postorius/', include('postorius.urls')),
-    url(r'^hyperkitty/', include('hyperkitty.urls')),
+    url(r'^mailman3/', include('postorius.urls')),
+    url(r'^archives/', include('hyperkitty.urls')),
     url(r'', include('django_mailman3.urls')),
     url(r'^accounts/', include('allauth.urls')),
     # Django admin
diff --git a/salt/profile/mailman3/files/uwsgi.ini b/salt/profile/mailman3/files/uwsgi.ini
index e00fb26..e78710a 100644
--- a/salt/profile/mailman3/files/uwsgi.ini
+++ b/salt/profile/mailman3/files/uwsgi.ini
@@ -2,9 +2,9 @@
 #
 [uwsgi]
 # Port on which uwsgi will be listening.
-uwsgi-socket = /var/lib/mailman/server.sock
+uwsgi-socket = 0.0.0.0:8000
 
-plugins = logfile
+plugin = python3, logfile
 
 # Move to the directory wher the django files are.
 chdir = /var/lib/mailman_webui
@@ -22,7 +22,7 @@ uid = 4200
 gid = 4200
 
 # Setup the django_q related worker processes.
-attach-daemon = python3 /var/lib/mailman_webui/manage.py qcluster
+attach-daemon = python3 ./manage.py qcluster
 
 # Setup the request log.
 req-logger = file://var/log/mailman/uwsgi.log
diff --git a/salt/profile/mailman3/master.sls b/salt/profile/mailman3/master.sls
index ac8432a..1f15151 100644
--- a/salt/profile/mailman3/master.sls
+++ b/salt/profile/mailman3/master.sls
@@ -1,3 +1,9 @@
+lists-o-o_pgks:
+  pkg.installed:
+    - pkgs:
+      - make
+      - python3-libsass
+
 https://github.com/openSUSE/lists-o-o.git:
   git.latest:
     - branch: master
@@ -16,3 +22,9 @@ https://github.com/openSUSE/lists-o-o.git:
 /var/lib/mailman_webui/static-openSUSE:
   file.symlink:
     - target: /var/lib/mailman/lists-o-o/webui-assets
+
+lists-o-o_build:
+  cmd.run:
+    - name: make
+    - cwd: /var/lib/mailman/lists-o-o
+    - runas: mailman