From b49ce8d0a0da264d2e1100d08ec8ea4c6c493ed2 Mon Sep 17 00:00:00 2001
From: Sasi Olin <hel@lcp.world>
Date: Apr 05 2021 16:06:34 +0000
Subject: Add the rewritemap config for mailman


---

diff --git a/pillar/role/mailman3.sls b/pillar/role/mailman3.sls
index b90ae8a..b1deb88 100644
--- a/pillar/role/mailman3.sls
+++ b/pillar/role/mailman3.sls
@@ -29,18 +29,38 @@ nginx:
       managed:
         lists.opensuse.org.conf:
           config:
+            - map $request_uri $mails_rewritemap:
+                - include /etc/nginx/mails.rewritemap
+            - map $request_uri $lists_rewritemap:
+                - include /etc/nginx/lists.rewritemap
+            - map $request_uri $feeds_rewritemap:
+                - include /etc/nginx/feeds.rewritemap
+            - map $request_uri $mboxs_rewritemap:
+                - include /etc/nginx/mboxs.rewritemap
             - server:
                 - server_name: lists.opensuse.org
                 - listen:
                     - 80
                     - default_server
+                - if ($mails_rewrite:map):
+                    - rewrite: ^(.*)$ $mails_rewrite:map permanent
+                - if ($lists_rewrite:map):
+                    - rewrite: ^(.*)$ $lists_rewrite:map permanent
+                - if ($feeds_rewrite:map):
+                    - rewrite: ^(.*)$ $feeds_rewrite:map permanent
+                - if ($mboxs_rewrite:map):
+                    - rewrite: ^(.*)$ $mboxs_rewrite:map permanent
+                - location /cgi-bin/search.cgi:
+                    - return: 301 /archives/search
+                - location /stats:
+                    - return: 301 /
                 - location /static/django-mailman3/img/login/opensuse.png:
-                  - return: 301 https://static.opensuse.org/favicon-24.png
+                    - return: 301 https://static.opensuse.org/favicon-24.png
                 - location /static/:
-                  - alias: /var/lib/mailman_webui/static/
+                    - alias: /var/lib/mailman_webui/static/
                 - location /:
-                  - include: /etc/nginx/uwsgi_params
-                  - uwsgi_pass: 0.0.0.0:8000
+                    - include: /etc/nginx/uwsgi_params
+                    - uwsgi_pass: 0.0.0.0:8000
           enabled: True
 
 sudoers:
diff --git a/salt/profile/mailman3/config.sls b/salt/profile/mailman3/config.sls
index 9d7f2f4..118f793 100644
--- a/salt/profile/mailman3/config.sls
+++ b/salt/profile/mailman3/config.sls
@@ -149,3 +149,48 @@ mailman_hyperkitty_conf:
     - mode: 640
     - user: mailman
     - group: mailman
+
+mailman_nginx_conf:
+  file.managed:
+    - name: /etc/nginx/conf.d/lists.opensuse.org.conf
+    - source: salt://profile/mailman3/files/nginx.conf
+    - require_in:
+      - service: mailman_webui_service
+    - watch_in:
+      - module: mailman_webui_restart
+
+mailman_nginx_mails_rewritemap:
+  file.managed:
+    - name: /etc/nginx/mails.rewritemap
+    - source: salt://profile/mailman3/files/mails.rewritemap
+    - require_in:
+      - service: mailman_webui_service
+    - watch_in:
+      - module: mailman_webui_restart
+
+mailman_nginx_lists_rewritemap:
+  file.managed:
+    - name: /etc/nginx/lists.rewritemap
+    - source: salt://profile/mailman3/files/lists.rewritemap
+    - require_in:
+      - service: mailman_webui_service
+    - watch_in:
+      - module: mailman_webui_restart
+
+mailman_nginx_feeds_rewritemap:
+  file.managed:
+    - name: /etc/nginx/feeds.rewritemap
+    - source: salt://profile/mailman3/files/feeds.rewritemap
+    - require_in:
+      - service: mailman_webui_service
+    - watch_in:
+      - module: mailman_webui_restart
+
+mailman_nginx_mboxs_rewritemap:
+  file.managed:
+    - name: /etc/nginx/mboxs.rewritemap
+    - source: salt://profile/mailman3/files/mboxs.rewritemap
+    - require_in:
+      - service: mailman_webui_service
+    - watch_in:
+      - module: mailman_webui_restart
diff --git a/salt/profile/mailman3/files/nginx.conf b/salt/profile/mailman3/files/nginx.conf
new file mode 100644
index 0000000..d5a8621
--- /dev/null
+++ b/salt/profile/mailman3/files/nginx.conf
@@ -0,0 +1,2 @@
+map_hash_bucket_size 8192;
+map_hash_max_size 65536;
diff --git a/salt/profile/mailman3/mailman.sls b/salt/profile/mailman3/mailman.sls
index 81b0180..f890375 100644
--- a/salt/profile/mailman3/mailman.sls
+++ b/salt/profile/mailman3/mailman.sls
@@ -13,6 +13,7 @@ mailman_pgks:
       # html => text for mailman
       - lynx
       - memcached
+      - nginx-rewrite-lists-openSUSE
 
 mailman:
   user.present: