From 5399b81cf8a7f7f5cb5a7ebc0a1bdeea9234952b Mon Sep 17 00:00:00 2001
From: Sasi Olin <hellcp@opensuse.org>
Date: Apr 06 2021 04:26:02 +0000
Subject: Sync settings from mailman machine


---

diff --git a/pillar/role/mailman3.sls b/pillar/role/mailman3.sls
index 27f4b69..d131dfb 100644
--- a/pillar/role/mailman3.sls
+++ b/pillar/role/mailman3.sls
@@ -21,6 +21,7 @@ profile:
     database_host: 192.168.47.4
     server_list:
       - lists.opensuse.org
+      - lists.uyuni-project.org
       - mailman3.infra.opensuse.org
 
 nginx:
@@ -38,7 +39,7 @@ nginx:
             - map $request_uri $mboxs_rewritemap:
                 - include /etc/nginx/mboxs.rewritemap
             - server:
-                - server_name: lists.opensuse.org
+                - server_name: lists.opensuse.org lists.uyuni-project.org
                 - listen:
                     - 80
                     - default_server
diff --git a/salt/profile/mailman3/config.sls b/salt/profile/mailman3/config.sls
index 118f793..d15dee2 100644
--- a/salt/profile/mailman3/config.sls
+++ b/salt/profile/mailman3/config.sls
@@ -158,39 +158,3 @@ mailman_nginx_conf:
       - 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/mailman.cfg b/salt/profile/mailman3/files/mailman.cfg
index 1591329..e9805c2 100644
--- a/salt/profile/mailman3/files/mailman.cfg
+++ b/salt/profile/mailman3/files/mailman.cfg
@@ -23,7 +23,8 @@ lmtp_host: localhost
 lmtp_port: 8024
 smtp_host: localhost
 smtp_port: 25
-remove_dkim_headers: yes
+remove_dkim_headers: no
+verp_probes: yes
 
 # Remember, this should NOT be accessible from the outside of infra.o.o
 [webservice]
diff --git a/salt/profile/mailman3/files/settings.py b/salt/profile/mailman3/files/settings.py
index 62bae8a..c74b46f 100644
--- a/salt/profile/mailman3/files/settings.py
+++ b/salt/profile/mailman3/files/settings.py
@@ -224,3 +224,6 @@ HAYSTACK_CONNECTIONS = {
 #         'LOCATION': '127.0.0.1:11211',
 #     }
 # }
+
+USE_L10N = False
+TIME_FORMAT = 'H:i'