From b0d5658b2c88a98d164af150774d4ac2707a1a9f Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 14 Jan 2021 20:10:08 +0000 Subject: [PATCH] Temporarily serve static sites from AFS R+W vols We're severely backlogged on AFS volume replication, and may be looking at a week or more before we're caught back up. In the meantime, serve content from the writeable path instead of the read-only replica path so we're not stuck with outdated content on our static sites. Change-Id: If0c772d72af20aa1210ea3fae7e960fad4689678 --- playbooks/roles/static/files/00-static.opendev.org.conf | 2 +- playbooks/roles/static/files/50-developer.openstack.org.conf | 4 ++-- playbooks/roles/static/files/50-docs.airshipit.org.conf | 2 +- playbooks/roles/static/files/50-docs.opendev.org.conf | 4 ++-- playbooks/roles/static/files/50-docs.openstack.org.conf | 4 ++-- playbooks/roles/static/files/50-docs.starlingx.io.conf | 4 ++-- playbooks/roles/static/files/50-governance.openstack.org.conf | 2 +- playbooks/roles/static/files/50-releases.openstack.org.conf | 2 +- playbooks/roles/static/files/50-security.openstack.org.conf | 2 +- .../roles/static/files/50-service-types.openstack.org.conf | 2 +- playbooks/roles/static/files/50-specs.openstack.org.conf | 2 +- playbooks/roles/static/files/50-tarballs.opendev.org.conf | 2 +- playbooks/roles/static/files/50-zuul-ci.org.conf | 4 ++-- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/playbooks/roles/static/files/00-static.opendev.org.conf b/playbooks/roles/static/files/00-static.opendev.org.conf index 4ce316b8be..2dc30d6aec 100644 --- a/playbooks/roles/static/files/00-static.opendev.org.conf +++ b/playbooks/roles/static/files/00-static.opendev.org.conf @@ -1,4 +1,4 @@ -Define AFS_ROOT /afs/openstack.org/ +Define AFS_ROOT /afs/.openstack.org/ ServerName static.opendev.org diff --git a/playbooks/roles/static/files/50-developer.openstack.org.conf b/playbooks/roles/static/files/50-developer.openstack.org.conf index 8be9373e95..0578c551e5 100644 --- a/playbooks/roles/static/files/50-developer.openstack.org.conf +++ b/playbooks/roles/static/files/50-developer.openstack.org.conf @@ -24,8 +24,8 @@ SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:!AES256:!aNULL:!eNULL:!MD5:!DSS:!PSK:!SRP SSLHonorCipherOrder on - DocumentRoot /afs/openstack.org/developer-docs - + DocumentRoot /afs/.openstack.org/developer-docs + Options Indexes FollowSymLinks MultiViews Require all granted # Allow mod_rewrite rules diff --git a/playbooks/roles/static/files/50-docs.airshipit.org.conf b/playbooks/roles/static/files/50-docs.airshipit.org.conf index d556e533aa..bba8ac7d76 100755 --- a/playbooks/roles/static/files/50-docs.airshipit.org.conf +++ b/playbooks/roles/static/files/50-docs.airshipit.org.conf @@ -1,4 +1,4 @@ -Define AFS_ROOT /afs/openstack.org/project/airshipit.org +Define AFS_ROOT /afs/.openstack.org/project/airshipit.org ServerName docs.airshipit.org diff --git a/playbooks/roles/static/files/50-docs.opendev.org.conf b/playbooks/roles/static/files/50-docs.opendev.org.conf index f82af76a47..7129ae7032 100644 --- a/playbooks/roles/static/files/50-docs.opendev.org.conf +++ b/playbooks/roles/static/files/50-docs.opendev.org.conf @@ -25,8 +25,8 @@ SSLHonorCipherOrder on - DocumentRoot /afs/openstack.org/project/opendev.org/docs - + DocumentRoot /afs/.openstack.org/project/opendev.org/docs + Options Indexes FollowSymLinks MultiViews Require all granted AllowOverride None diff --git a/playbooks/roles/static/files/50-docs.openstack.org.conf b/playbooks/roles/static/files/50-docs.openstack.org.conf index 5c4cd8bf74..60f009f099 100644 --- a/playbooks/roles/static/files/50-docs.openstack.org.conf +++ b/playbooks/roles/static/files/50-docs.openstack.org.conf @@ -24,8 +24,8 @@ SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:!AES256:!aNULL:!eNULL:!MD5:!DSS:!PSK:!SRP SSLHonorCipherOrder on - DocumentRoot /afs/openstack.org/docs - + DocumentRoot /afs/.openstack.org/docs + Options Indexes FollowSymLinks MultiViews Require all granted AllowOverride None diff --git a/playbooks/roles/static/files/50-docs.starlingx.io.conf b/playbooks/roles/static/files/50-docs.starlingx.io.conf index 7f2455ee79..b23fee4841 100644 --- a/playbooks/roles/static/files/50-docs.starlingx.io.conf +++ b/playbooks/roles/static/files/50-docs.starlingx.io.conf @@ -24,8 +24,8 @@ SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:!AES256:!aNULL:!eNULL:!MD5:!DSS:!PSK:!SRP SSLHonorCipherOrder on - DocumentRoot /afs/openstack.org/project/starlingx.io/www - + DocumentRoot /afs/.openstack.org/project/starlingx.io/www + Options Indexes FollowSymLinks MultiViews Require all granted AllowOverride None diff --git a/playbooks/roles/static/files/50-governance.openstack.org.conf b/playbooks/roles/static/files/50-governance.openstack.org.conf index ce81817f27..3ca853f91d 100644 --- a/playbooks/roles/static/files/50-governance.openstack.org.conf +++ b/playbooks/roles/static/files/50-governance.openstack.org.conf @@ -1,4 +1,4 @@ -Define AFS_ROOT /afs/openstack.org/project/governance.openstack.org +Define AFS_ROOT /afs/.openstack.org/project/governance.openstack.org ServerName governance.openstack.org diff --git a/playbooks/roles/static/files/50-releases.openstack.org.conf b/playbooks/roles/static/files/50-releases.openstack.org.conf index c530eda8b5..d0c3742665 100644 --- a/playbooks/roles/static/files/50-releases.openstack.org.conf +++ b/playbooks/roles/static/files/50-releases.openstack.org.conf @@ -1,4 +1,4 @@ -Define AFS_ROOT /afs/openstack.org/project/releases.openstack.org +Define AFS_ROOT /afs/.openstack.org/project/releases.openstack.org ServerName releases.openstack.org diff --git a/playbooks/roles/static/files/50-security.openstack.org.conf b/playbooks/roles/static/files/50-security.openstack.org.conf index d00da91167..cbc12f89b0 100644 --- a/playbooks/roles/static/files/50-security.openstack.org.conf +++ b/playbooks/roles/static/files/50-security.openstack.org.conf @@ -1,4 +1,4 @@ -Define AFS_ROOT /afs/openstack.org/project/security.openstack.org +Define AFS_ROOT /afs/.openstack.org/project/security.openstack.org ServerName security.openstack.org diff --git a/playbooks/roles/static/files/50-service-types.openstack.org.conf b/playbooks/roles/static/files/50-service-types.openstack.org.conf index 34bd30f42a..abae8f08a3 100644 --- a/playbooks/roles/static/files/50-service-types.openstack.org.conf +++ b/playbooks/roles/static/files/50-service-types.openstack.org.conf @@ -1,4 +1,4 @@ -Define AFS_ROOT /afs/openstack.org/project/service-types.openstack.org +Define AFS_ROOT /afs/.openstack.org/project/service-types.openstack.org ServerName service-types.openstack.org diff --git a/playbooks/roles/static/files/50-specs.openstack.org.conf b/playbooks/roles/static/files/50-specs.openstack.org.conf index 95b8470624..2c33cc58fc 100644 --- a/playbooks/roles/static/files/50-specs.openstack.org.conf +++ b/playbooks/roles/static/files/50-specs.openstack.org.conf @@ -1,4 +1,4 @@ -Define AFS_ROOT /afs/openstack.org/project/specs.openstack.org +Define AFS_ROOT /afs/.openstack.org/project/specs.openstack.org ServerName specs.openstack.org diff --git a/playbooks/roles/static/files/50-tarballs.opendev.org.conf b/playbooks/roles/static/files/50-tarballs.opendev.org.conf index 25748cc722..fe6a040bb3 100644 --- a/playbooks/roles/static/files/50-tarballs.opendev.org.conf +++ b/playbooks/roles/static/files/50-tarballs.opendev.org.conf @@ -241,7 +241,7 @@ RewriteRule "^/openstack/zuul(.*?)$" "/zuul/zuul$1" [R=301,L] -Define AFS_ROOT /afs/openstack.org/project/tarballs.opendev.org +Define AFS_ROOT /afs/.openstack.org/project/tarballs.opendev.org ServerName tarballs.opendev.org diff --git a/playbooks/roles/static/files/50-zuul-ci.org.conf b/playbooks/roles/static/files/50-zuul-ci.org.conf index 98058f5af4..412d7d50e1 100644 --- a/playbooks/roles/static/files/50-zuul-ci.org.conf +++ b/playbooks/roles/static/files/50-zuul-ci.org.conf @@ -33,8 +33,8 @@ SSLCertificateKeyFile /etc/letsencrypt-certs/zuul-ci.org/zuul-ci.org.key SSLCertificateChainFile /etc/letsencrypt-certs/zuul-ci.org/ca.cer - DocumentRoot /afs/openstack.org/project/zuul-ci.org/www - + DocumentRoot /afs/.openstack.org/project/zuul-ci.org/www + Options Indexes FollowSymLinks MultiViews Require all granted AllowOverride None