opendev/system-config
Code Issues Proposed changes

static: add static.openstack.org/files.openstack.org

Browse Source 
files.openstack.org serves a view of /afs/openstack.org/, which is the
same as static.opendev.org.  Add a serveralias for it and certificate.

Make static.openstack.org be consistent with opendev by showing the
same thing.

Change-Id: I4c492e3b02554a7c736c015790bd4cd5bb435a43
This commit is contained in:
Ian Wienand 2020-02-21 14:55:11 +11:00
parent 9566bd0e2a
commit 56509e83a4
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/host_vars/static01.opendev.org.yaml
View File

@ -3,6 +3,8 @@ letsencrypt_certs:
static01-opendev-org-main: static01-opendev-org-main:
- static.opendev.org - static.opendev.org
- static01.opendev.org - static01.opendev.org
- files.openstack.org
- static.openstack.org
static01-developer-openstack-org: static01-developer-openstack-org:
- developer.openstack.org - developer.openstack.org
static01-docs-opendev-org: static01-docs-opendev-org:

4
playbooks/roles/static/files/00-static.opendev.org.conf
View File

@ -2,7 +2,7 @@ Define AFS_ROOT /afs/openstack.org/
<VirtualHost *:80> <VirtualHost *:80>
ServerName static.opendev.org ServerName static.opendev.org
ServerAlias static.openstack.org ServerAlias static.openstack.org files.openstack.org
RewriteEngine On RewriteEngine On
RewriteRule ^/(.*) https://static.opendev.org/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://static.opendev.org/$1 [last,redirect=permanent]
LogLevel warn LogLevel warn
@ -15,7 +15,7 @@ Define AFS_ROOT /afs/openstack.org/
<VirtualHost *:443> <VirtualHost *:443>
ServerName static.opendev.org ServerName static.opendev.org
ServerAlias static.openstack.org ServerAlias static.openstack.org files.openstack.org
DocumentRoot ${AFS_ROOT} DocumentRoot ${AFS_ROOT}

15
testinfra/test_static.py
View File

@ -29,10 +29,17 @@ def test_zuul_user(host):
user.home) user.home)
assert authorized_keys.exists assert authorized_keys.exists
def test_static_opendev_org(host): static_names = (
'static.opendev.org',
'static.openstack.org',
'files.openstack.org',
)
@pytest.mark.parametrize("name", static_names)
def test_static_opendev_org(host, name):
cmd = host.run('curl --insecure ' cmd = host.run('curl --insecure '
'--resolve static.opendev.org:443:127.0.0.1 ' '--resolve %s:443:127.0.0.1 https://%s/' %
'https://static.opendev.org/') (name, name))
assert 'Index of /' in cmd.stdout assert 'Index of /' in cmd.stdout
def test_governance_openstack_org(host): def test_governance_openstack_org(host):
@ -116,7 +123,7 @@ zuul_names = (
) )
@pytest.mark.parametrize("name", zuul_names) @pytest.mark.parametrize("name", zuul_names)
def test_docs_openstack_org(host, name): def test_zuulci_org(host, name):
cmd = host.run('curl --insecure ' cmd = host.run('curl --insecure '
'--resolve %s:443:127.0.0.1 https://%s/ ' % '--resolve %s:443:127.0.0.1 https://%s/ ' %