From 5d6cee89f436d6d60a86afd41ee7c91fe7905046 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Tue, 21 Dec 2021 18:54:10 +0000 Subject: [PATCH] Move foundation-board-confidential ML to openinfra In keeping with its name change to the Open Infrastructure Foundation, the confidential board mailing list is moving from lists.openstack.org to lists.openinfra.dev. Set up address forwarding and Web redirects to reflect this, and add a mailman list entry for it (there's no old one to remove as it wasn't previously included in our configuration). Note that this should be a no-op when it merges, as the list move will be handled manually while deployment is temporarily disabled for the server. Change-Id: I191676bcb7f878afab17ec3c1735219d91b4de4d --- inventory/service/host_vars/lists.openstack.org.yaml | 5 +++++ .../roles/mailman-site/templates/mailman_multihost.vhost.j2 | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/inventory/service/host_vars/lists.openstack.org.yaml b/inventory/service/host_vars/lists.openstack.org.yaml index 3f6889c113..22c88894ff 100644 --- a/inventory/service/host_vars/lists.openstack.org.yaml +++ b/inventory/service/host_vars/lists.openstack.org.yaml @@ -38,6 +38,7 @@ exim_domain_aliases: community@lists.openstack.org: community@lists.openinfra.dev foundation@lists.openstack.org: foundation@lists.openinfra.dev foundation-board@lists.openstack.org: foundation-board@lists.openinfra.dev + foundation-board-confidential@lists.openstack.org: foundation-board-confidential@lists.openinfra.dev staff@lists.openstack.org: staff@lists.openinfra.dev exim_routers: - mailman_verp_router: | @@ -205,6 +206,10 @@ mailman_sites: description: 'OpenInfra Foundation Board of Directors' admin: 'jeremy@openinfra.dev' password: "{{ mailman_list_password }}" + - name: foundation-board-confidential + description: 'OpenInfra Foundation Board of Directors' + admin: 'jeremy@openinfra.dev' + password: "{{ mailman_list_password }}" - name: staff description: 'Private list for OpenInfra Foundation staff members' admin: 'jeremy@openinfra.dev' diff --git a/playbooks/roles/mailman-site/templates/mailman_multihost.vhost.j2 b/playbooks/roles/mailman-site/templates/mailman_multihost.vhost.j2 index 3e0d80ae29..a58a0d9036 100644 --- a/playbooks/roles/mailman-site/templates/mailman_multihost.vhost.j2 +++ b/playbooks/roles/mailman-site/templates/mailman_multihost.vhost.j2 @@ -15,7 +15,7 @@ RewriteEngine on # TODO(fungi): convert this vhost into a blanket redirect to HTTPS when ready RewriteRule ^/$ /cgi-bin/mailman/listinfo [R] RewriteCond %{HTTP_HOST} ^lists\.openstack\.org$ [nocase] -RewriteRule /(cgi-bin/mailman/listinfo|pipermail)/(community|foundation|foundation-board|staff)(/.*|$) %{REQUEST_SCHEME}://lists.openinfra.dev/$1/$2$3 [last,redirect=permanent] +RewriteRule /(cgi-bin/mailman/listinfo|pipermail)/(community|foundation|foundation-board|foundation-board-confidential|staff)(/.*|$) %{REQUEST_SCHEME}://lists.openinfra.dev/$1/$2$3 [last,redirect=permanent] # We can find mailman here: ScriptAlias /cgi-bin/mailman/ /usr/lib/cgi-bin/mailman/ @@ -84,7 +84,7 @@ Alias /images/mailman/ /usr/share/images/mailman/ RewriteEngine on RewriteRule ^/$ /cgi-bin/mailman/listinfo [R] RewriteCond %{HTTP_HOST} ^lists\.openstack\.org$ [nocase] - RewriteRule /(cgi-bin/mailman/listinfo|pipermail)/(community|foundation|foundation-board|staff)(/.*|$) %{REQUEST_SCHEME}://lists.openinfra.dev/$1/$2$3 [last,redirect=permanent] + RewriteRule /(cgi-bin/mailman/listinfo|pipermail)/(community|foundation|foundation-board|foundation-board-confidential|staff)(/.*|$) %{REQUEST_SCHEME}://lists.openinfra.dev/$1/$2$3 [last,redirect=permanent] ScriptAlias /cgi-bin/mailman/ /usr/lib/cgi-bin/mailman/ Alias /pipermail/ /srv/mailman/{{ mailman_site.name }}/archives/public/