Update the Mailman role after addition of fedorahosted

inventory/group_vars/mailman

@@ -26,7 +26,9 @@ postfix_group: mailman
 
 # Used by the mailman role
 mailman_db_server: db01.phx2.fedoraproject.org
-mailman_url: lists.fedoraproject.org
+mailman_domains:
+- lists.fedoraproject.org
+- lists.fedorahosted.org
 
 # by default, the number of emails in queue before we whine
 nrpe_check_postfix_queue_warn: 20

inventory/group_vars/mailman-stg

@@ -32,10 +32,12 @@ virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
 
 # Postfix main.cf
 postfix_group: mailman-stg
-mailman_url: lists.stg.fedoraproject.org
 
 # Used by the mailman role
 mailman_db_server: db01.stg.phx2.fedoraproject.org
+mailman_domains:
+- lists.stg.fedoraproject.org
+- lists.fedorahosted.org
 
 # by default, the number of emails in queue before we whine
 nrpe_check_postfix_queue_warn: 20

inventory/host_vars/lists-dev.fedorainfracloud.org

@@ -18,5 +18,6 @@ cloud_networks:
   - net-id: "67b77354-39a4-43de-b007-bb813ac5c35f"
 
 # Used by the mailman role
-mailman_url: lists-dev.cloud.fedoraproject.org
 mailman_db_server: localhost
+mailman_domains:
+- lists-dev.fedorainfracloud.org

playbooks/hosts/lists-dev.fedorainfracloud.org.yml

@@ -136,7 +136,6 @@
     mailman_hyperkitty_admin_db_pass: "{{ lists_dev_hk_db_pass }}"
     mailman_hyperkitty_db_pass: "{{ lists_dev_hk_db_pass }}"
     mailman_hyperkitty_cookie_key: "randomstringusedasacookiesecurekey-yesthisshouldbeinaprivaterepo_butidonthaveaccesstoit"
-    mailman_url: "{{ ansible_fqdn }}"
   - collectd/base
 
   tasks:

roles/base/files/postfix/main.cf/main.cf.hosted-lists01.fedoraproject.org

@@ -509,6 +509,8 @@ recipient_delimiter = +
 #fallback_transport =
 
 #transport_maps = hash:/etc/postfix/transport
+transport_maps = hash:/etc/mailman/mailman3-transport
+
 # The luser_relay parameter specifies an optional destination address
 # for unknown recipients.  By default, mail for unknown@$mydestination,
 # unknown@[$inet_interfaces] or unknown@[$proxy_interfaces] is returned

roles/base/files/postfix/main.cf/main.cf.mailman

@@ -156,8 +156,9 @@ inet_interfaces = all
 #
 # See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS".
 #
-mydestination = $myhostname, lists.fedoraproject.org,
+mydestination = $myhostname,
-                localhost.$mydomain, localhost
+                localhost.$mydomain, localhost,
+                lists.fedoraproject.org, lists.fedorahosted.org
 #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
 #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain,
 #	mail.$mydomain, www.$mydomain, ftp.$mydomain

roles/mailman/defaults/main.yml

@@ -6,4 +6,6 @@ mailman_mailman_db_pass: changeme
 mailman_hyperkitty_admin_db_pass: changeme
 mailman_hyperkitty_db_pass: changeme
 mailman_hyperkitty_cookie_key: changeme
-mailman_url: lists.example.com
+mailman_domains:
+- lists.example.com
+- lists.example.org

roles/mailman/templates/bottom.html

@@ -10,6 +10,6 @@
 {% else %}
    'url': 'https://apps.fedoraproject.org/js/data.js',
 {% endif %}
-   'position': 'bottom-right'
+   'position': 'bottom-left'
  });
 </script>

roles/mailman/templates/mailman-migration.conf.j2

@@ -1,3 +1,2 @@
 basedir: {{ mailman_webui_basedir }}
 confdir: {{ mailman_webui_confdir }}
-domain: {{ mailman_url }}

roles/mailman/templates/settings.py.j2

@@ -21,7 +21,9 @@ ADMINS = (
 # Hosts/domain names that are valid for this site; required if DEBUG is False
 # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
 ALLOWED_HOSTS = [
-    "{{ mailman_url }}",
+{% for host in mailman_domains %}
+    "{{ host }}",
+{% endfor %}
     ".fedoraproject.org",
     "discuss.arquillian.org",
     "localhost", # Archiving API from Mailman
@@ -30,7 +32,9 @@ ALLOWED_HOSTS = [
 # And for BrowserID too, see
 # http://django-browserid.rtfd.org/page/user/settings.html#django.conf.settings.BROWSERID_AUDIENCES
 BROWSERID_AUDIENCES = [
-    "https://{{ mailman_url }}",
+{% for host in mailman_domains %}
+    "{{ host }}",
+{% endfor %}
 ]
 
 # Mailman API credentials
@@ -108,7 +112,7 @@ DATABASES = {
 USE_X_FORWARDED_HOST = True
 # In the Fedora infra, requests are systematically redirected to HTTPS, so put
 # something always true here:
-SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_SERVER', 'lists.fedoraproject.org') # It's always that, even on staging
+SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_SCHEME', 'https')
 
 # Internationalization
 # https://docs.djangoproject.com/en/1.6/topics/i18n/