diff --git a/playbooks/host_vars/static01.opendev.org.yaml b/playbooks/host_vars/static01.opendev.org.yaml index 23bbe0996b..e38301579f 100644 --- a/playbooks/host_vars/static01.opendev.org.yaml +++ b/playbooks/host_vars/static01.opendev.org.yaml @@ -38,8 +38,6 @@ letsencrypt_certs: - keystone.openstack.org static01-nova-openstack-org: - nova.openstack.org - static01-qa-openstack-org: - - qa.openstack.org static01-service-types-openstack-org: - service-types.openstack.org static01-security-openstack-org: diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml index ce67b9f2b3..971ae3f185 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -86,9 +86,6 @@ - name: letsencrypt updated static01-nova-openstack-org include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml -- name: letsencrypt updated static01-qa-openstack-org - include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml - - name: letsencrypt updated static01-service-types-openstack-org include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml diff --git a/playbooks/roles/static/files/50-qa.openstack.org.conf b/playbooks/roles/static/files/50-qa.openstack.org.conf deleted file mode 100644 index 7f51162d6d..0000000000 --- a/playbooks/roles/static/files/50-qa.openstack.org.conf +++ /dev/null @@ -1,31 +0,0 @@ - - ServerName qa.openstack.org - - RewriteEngine On - RewriteRule ^/(.*) https://docs.openstack.org/ [last,redirect=permanent] - - LogLevel warn - ErrorLog /var/log/apache2/qa.openstack.org_error.log - CustomLog /var/log/apache2/qa.openstack.org_access.log combined - ServerSignature Off - - - - ServerName qa.openstack.org - - SSLCertificateFile /etc/letsencrypt-certs/qa.openstack.org/qa.openstack.org.cer - SSLCertificateKeyFile /etc/letsencrypt-certs/qa.openstack.org/qa.openstack.org.key - SSLCertificateChainFile /etc/letsencrypt-certs/qa.openstack.org/ca.cer - SSLProtocol All -SSLv2 -SSLv3 - # Note: this list should ensure ciphers that provide forward secrecy - SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:!AES256:!aNULL:!eNULL:!MD5:!DSS:!PSK:!SRP - SSLHonorCipherOrder on - - RewriteEngine On - RewriteRule ^/(.*) https://docs.openstack.org/ [last,redirect=permanent] - - LogLevel warn - ErrorLog /var/log/apache2/qa.openstack.org_error.log - CustomLog /var/log/apache2/qa.openstack.org_access.log combined - ServerSignature Off - diff --git a/playbooks/roles/static/tasks/main.yaml b/playbooks/roles/static/tasks/main.yaml index 63fdac4719..d85e56b38e 100644 --- a/playbooks/roles/static/tasks/main.yaml +++ b/playbooks/roles/static/tasks/main.yaml @@ -77,7 +77,6 @@ - 50-horizon.openstack.org - 50-keystone.openstack.org - 50-nova.openstack.org - - 50-qa.openstack.org - 50-security.openstack.org - 50-service-types.openstack.org - 50-specs.openstack.org diff --git a/testinfra/test_static.py b/testinfra/test_static.py index 05745ddbca..194c36fa52 100644 --- a/testinfra/test_static.py +++ b/testinfra/test_static.py @@ -165,7 +165,6 @@ doc_redirects = ( ('horizon.openstack.org', 'https://docs.openstack.org/horizon/latest'), ('keystone.openstack.org', 'https://docs.openstack.org/keystone/latest'), ('nova.openstack.org', 'https://docs.openstack.org/nova/latest'), - ('qa.openstack.org', 'https://docs.openstack.org/'), ('swift.openstack.org', 'https://docs.openstack.org/swift/latest'), )