diff --git a/inventory/service/host_vars/lists.openstack.org.yaml b/inventory/service/host_vars/lists.openstack.org.yaml index 4deb5e94f5..9c7b1fa95d 100644 --- a/inventory/service/host_vars/lists.openstack.org.yaml +++ b/inventory/service/host_vars/lists.openstack.org.yaml @@ -1,4 +1,4 @@ -mm_domains: 'lists.openstack.org:lists.airshipit.org:lists.starlingx.io:lists.openinfra.dev' +mm_domains: 'lists.openstack.org' exim_local_domains: "@:{{ mm_domains }}" exim_enable_spf: true exim_aliases: @@ -112,55 +112,8 @@ exim_transports: letsencrypt_certs: lists-openstack-org-main: - lists.openstack.org - - lists.airshipit.org - - lists.openinfra.dev - - lists.starlingx.io mailman_multihost: true mailman_sites: - - name: openinfra - listdomain: lists.openinfra.dev - install_languages: ['en'] - lists: - - name: mailman - description: 'The mailman site list' - admin: 'nobody@openstack.org' - password: "{{ mailman_list_password }}" - - name: community - description: 'The OpenInfra Community team is the main contact point for anybody running a local OpenInfra Group.' - admin: 'jeremy@openinfra.dev' - password: "{{ mailman_list_password }}" - - name: foundation - description: 'General discussion list for activities of the OpenInfra Foundation' - admin: 'jeremy@openinfra.dev' - password: "{{ mailman_list_password }}" - - name: foundation-board - 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: goldmembers - description: 'The discussion list for Gold Members of the OpenInfra Foundation' - admin: 'jeremy@openinfra.dev' - password: "{{ mailman_list_password }}" - - name: marketing - description: 'The OpenInfra Marketing list is the meant to facilitate discussion and best practice sharing among marketers and event organizers in the OpenInfra community.' - admin: 'jeremy@openinfra.dev' - password: "{{ mailman_list_password }}" - - name: staff - description: 'Private list for OpenInfra Foundation staff members' - admin: 'jeremy@openinfra.dev' - password: "{{ mailman_list_password }}" - - name: summit-track-chairs - description: 'OpenInfra Summit track chair communications' - admin: 'erin@openinfra.dev' - password: "{{ mailman_list_password }}" - - name: summitsponsors - description: 'Coordination among OpenInfra Summit event sponsors' - admin: 'jeremy@openinfra.dev' - password: "{{ mailman_list_password }}" - name: openstack listdomain: lists.openstack.org install_languages: ['de', 'fr', 'it', 'ko', 'ru', 'vi', 'zh_TW'] @@ -213,19 +166,3 @@ mailman_sites: description: 'Discussion of OpenStack usage and development.' admin: 'fungi@yuggoth.org' password: "{{ mailman_list_password }}" - - name: starlingx - listdomain: lists.starlingx.io - install_languages: ['en'] - lists: - - name: mailman - description: 'The mailman site list' - admin: 'nobody@openstack.org' - password: "{{ mailman_list_password }}" - - name: starlingx-announce - description: 'Announcements of StarlingX releases and other important information.' - admin: 'jonathan@openstack.org' - password: "{{ mailman_list_password }}" - - name: starlingx-discuss - description: 'Discussion of StarlingX usage and development.' - admin: 'jonathan@openstack.org' - password: "{{ mailman_list_password }}" diff --git a/inventory/service/host_vars/lists01.opendev.org.yaml b/inventory/service/host_vars/lists01.opendev.org.yaml index 75a19e187f..12dcdc9de9 100644 --- a/inventory/service/host_vars/lists01.opendev.org.yaml +++ b/inventory/service/host_vars/lists01.opendev.org.yaml @@ -126,45 +126,54 @@ mailman_sites: - name: kata-hypervisor description: 'Discussion of security and virtualization targeted at container use cases' owner: 'jonathan@openstack.org' + - listdomain: lists.openinfra.dev + install_languages: ['en'] + lists: + - name: community + description: 'The OpenInfra Community team is the main contact point for anybody running a local OpenInfra Group.' + owner: 'allison@openinfra.dev' + - name: foundation + description: 'General discussion list for activities of the OpenInfra Foundation' + owner: 'jonathan@openinfra.dev' + - name: foundation-board + description: 'OpenInfra Foundation Board of Directors' + owner: 'jonathan@openinfra.dev' + - name: foundation-board-confidential + description: 'OpenInfra Foundation Board of Directors' + owner: 'jonathan@openinfra.dev' + private: true + - name: goldmembers + description: 'The discussion list for Gold Members of the OpenInfra Foundation' + owner: 'jonathan@openinfra.dev' + private: true + - name: marketing + description: 'The OpenInfra Marketing list is the meant to facilitate discussion and best practice sharing among marketers and event organizers in the OpenInfra community.' + owner: 'allison@openinfra.dev' + - name: staff + description: 'Private list for OpenInfra Foundation staff members' + owner: 'mark@openinfra.dev' + private: true + - name: summit-track-chairs + description: 'OpenInfra Summit track chair communications' + owner: 'erin@openinfra.dev' + private: true + - name: summitsponsors + description: 'Coordination among OpenInfra Summit event sponsors' + owner: 'erin@openinfra.dev' + private: true + - listdomain: lists.starlingx.io + install_languages: ['en'] + lists: + - name: starlingx-announce + description: 'Announcements of StarlingX releases and other important information.' + owner: 'jonathan@openstack.org' + - name: starlingx-discuss + description: 'Discussion of StarlingX usage and development.' + owner: 'jonathan@openstack.org' # The domains and lists below are currently commented out as we intend on # deploying a single domain and its lists at a time starting with # lists.opendev.org. As we deploy other domains we can uncomment these # blocks. Double check no new lists are been added or removed first. - #- listdomain: lists.openinfra.dev - # install_languages: ['en'] - # lists: - # - name: community - # description: 'The OpenInfra Community team is the main contact point for anybody running a local OpenInfra Group.' - # owner: 'allison@openinfra.dev' - # - name: foundation - # description: 'General discussion list for activities of the OpenInfra Foundation' - # owner: 'jonathan@openinfra.dev' - # - name: foundation-board - # description: 'OpenInfra Foundation Board of Directors' - # owner: 'jonathan@openinfra.dev' - # - name: foundation-board-confidential - # description: 'OpenInfra Foundation Board of Directors' - # owner: 'jonathan@openinfra.dev' - # private: true - # - name: goldmembers - # description: 'The discussion list for Gold Members of the OpenInfra Foundation' - # owner: 'jonathan@openinfra.dev' - # private: true - # - name: marketing - # description: 'The OpenInfra Marketing list is the meant to facilitate discussion and best practice sharing among marketers and event organizers in the OpenInfra community.' - # owner: 'allison@openinfra.dev' - # - name: staff - # description: 'Private list for OpenInfra Foundation staff members' - # owner: 'mark@openinfra.dev' - # private: true - # - name: summit-track-chairs - # description: 'OpenInfra Summit track chair communications' - # owner: 'erin@openinfra.dev' - # private: true - # - name: summitsponsors - # description: 'Coordination among OpenInfra Summit event sponsors' - # owner: 'erin@openinfra.dev' - # private: true #- listdomain: lists.openstack.org # install_languages: ['de', 'fr', 'it', 'ko', 'ru', 'vi', 'zh_TW'] # lists: @@ -214,12 +223,3 @@ mailman_sites: # - name: release-job-failures # description: 'Notification messages for failures from release-related build jobs.' # owner: 'doug@doughellmann.com' - #- listdomain: lists.starlingx.io - # install_languages: ['en'] - # lists: - # - name: starlingx-announce - # description: 'Announcements of StarlingX releases and other important information.' - # owner: 'jonathan@openstack.org' - # - name: starlingx-discuss - # description: 'Discussion of StarlingX usage and development.' - # owner: 'jonathan@openstack.org' diff --git a/testinfra/test_lists_o_o.py b/testinfra/test_lists_o_o.py index 7b3384c7d3..5312ce6469 100644 --- a/testinfra/test_lists_o_o.py +++ b/testinfra/test_lists_o_o.py @@ -13,48 +13,22 @@ testinfra_hosts = ['lists.openstack.org'] def test_mm_list_is_present(host): - cmd = host.run('HOST=lists.openinfra.dev list_lists --bare') - assert 'staff' in cmd.stdout - cmd = host.run('HOST=lists.openstack.org list_lists --bare') assert 'openstack-discuss' in cmd.stdout - cmd = host.run('HOST=lists.starlingx.io list_lists --bare') - assert 'starlingx-discuss' in cmd.stdout - def test_mm_list_site(host): - cmd = host.run('curl --insecure ' - '--resolve lists.openinfra.dev:443:127.0.0.1 ' - 'https://lists.openinfra.dev/cgi-bin/mailman/listinfo') - assert 'lists.openinfra.dev Mailing Lists' in cmd.stdout cmd = host.run('curl --insecure ' '--resolve lists.openstack.org:443:127.0.0.1 ' 'https://lists.openstack.org/cgi-bin/mailman/listinfo') assert 'lists.openstack.org Mailing Lists' in cmd.stdout - cmd = host.run('curl --insecure ' - '--resolve lists.starlingx.io:443:127.0.0.1 ' - 'https://lists.starlingx.io/cgi-bin/mailman/listinfo') - assert 'lists.starlingx.io Mailing Lists' in cmd.stdout def test_mm_list_site_redirect_http(host): - cmd = host.run('curl ' - '--resolve lists.openinfra.dev:80:127.0.0.1 ' - 'http://lists.openinfra.dev/cgi-bin/mailman/listinfo') - assert ('The document has moved here') in cmd.stdout cmd = host.run('curl ' '--resolve lists.openstack.org:80:127.0.0.1 ' 'http://lists.openstack.org/cgi-bin/mailman/listinfo') assert ('The document has moved here') in cmd.stdout - cmd = host.run('curl ' - '--resolve lists.starlingx.io:80:127.0.0.1 ' - 'http://lists.starlingx.io/cgi-bin/mailman/listinfo') - assert ('The document has moved here') in cmd.stdout def test_mm_list_site_redirect_listinfo(host): cmd = host.run('curl --insecure ' @@ -63,11 +37,6 @@ def test_mm_list_site_redirect_listinfo(host): assert ('The document has moved here') in cmd.stdout - cmd = host.run('curl --insecure --location ' - '--resolve lists.openinfra.dev:443:127.0.0.1 ' - '--resolve lists.openstack.org:443:127.0.0.1 ' - 'https://lists.openstack.org/cgi-bin/mailman/listinfo/staff') - assert 'Staff Info Page' in cmd.stdout def test_mm_list_site_redirect_archives(host): cmd = host.run('curl --insecure ' @@ -76,11 +45,6 @@ def test_mm_list_site_redirect_archives(host): assert ('The document has moved here') in cmd.stdout - cmd = host.run('curl --insecure --location ' - '--resolve lists.openinfra.dev:443:127.0.0.1 ' - '--resolve lists.openstack.org:443:127.0.0.1 ' - 'https://lists.openstack.org/pipermail/staff/') - assert '

The Staff Archives

' in cmd.stdout def test_mm_list_site_static_files(host): cmd = host.run('curl --insecure '