From 8924835bafca85f5243176d3c10c441891e411bd Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 16 Oct 2020 16:15:00 +0000 Subject: [PATCH] Update static Apache configs to 2.4 ACL primitives We don't need to keep using the old Apache 2.2 Satisfy ACL primitive because we are now running Apache 2.4 everywhere. Stick to Require as it simplifies understanding of ACLs by being consistent. Change-Id: Ib2f7ea1909b9798279efc77a42b632e7129bd1d0 --- playbooks/roles/static/files/00-static.opendev.org.conf | 1 - .../roles/static/files/50-developer.openstack.org.conf | 1 - playbooks/roles/static/files/50-docs.airshipit.org.conf | 1 - playbooks/roles/static/files/50-docs.opendev.org.conf | 1 - playbooks/roles/static/files/50-docs.openstack.org.conf | 1 - playbooks/roles/static/files/50-docs.starlingx.io.conf | 1 - .../roles/static/files/50-governance.openstack.org.conf | 6 ------ playbooks/roles/static/files/50-releases.openstack.org.conf | 1 - playbooks/roles/static/files/50-security.openstack.org.conf | 1 - .../roles/static/files/50-service-types.openstack.org.conf | 1 - playbooks/roles/static/files/50-specs.openstack.org.conf | 1 - playbooks/roles/static/files/50-tarballs.opendev.org.conf | 1 - playbooks/roles/static/files/50-zuul-ci.org.conf | 1 - 13 files changed, 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 91bc6808ae..4ce316b8be 100644 --- a/playbooks/roles/static/files/00-static.opendev.org.conf +++ b/playbooks/roles/static/files/00-static.opendev.org.conf @@ -30,7 +30,6 @@ Define AFS_ROOT /afs/openstack.org/ Options Indexes FollowSymLinks MultiViews AllowOverrideList Redirect RedirectMatch - Satisfy Any Require all granted diff --git a/playbooks/roles/static/files/50-developer.openstack.org.conf b/playbooks/roles/static/files/50-developer.openstack.org.conf index 502f430505..8be9373e95 100644 --- a/playbooks/roles/static/files/50-developer.openstack.org.conf +++ b/playbooks/roles/static/files/50-developer.openstack.org.conf @@ -27,7 +27,6 @@ DocumentRoot /afs/openstack.org/developer-docs Options Indexes FollowSymLinks MultiViews - Satisfy any Require all granted # Allow mod_rewrite rules AllowOverride FileInfo diff --git a/playbooks/roles/static/files/50-docs.airshipit.org.conf b/playbooks/roles/static/files/50-docs.airshipit.org.conf index db1d04b4df..d556e533aa 100755 --- a/playbooks/roles/static/files/50-docs.airshipit.org.conf +++ b/playbooks/roles/static/files/50-docs.airshipit.org.conf @@ -28,7 +28,6 @@ Define AFS_ROOT /afs/openstack.org/project/airshipit.org Options Indexes FollowSymLinks MultiViews AllowOverrideList Redirect RedirectMatch - Satisfy Any Require all granted diff --git a/playbooks/roles/static/files/50-docs.opendev.org.conf b/playbooks/roles/static/files/50-docs.opendev.org.conf index 288a43208f..f82af76a47 100644 --- a/playbooks/roles/static/files/50-docs.opendev.org.conf +++ b/playbooks/roles/static/files/50-docs.opendev.org.conf @@ -28,7 +28,6 @@ DocumentRoot /afs/openstack.org/project/opendev.org/docs Options Indexes FollowSymLinks MultiViews - Satisfy any Require all granted AllowOverride None # Allow mod_rewrite rules diff --git a/playbooks/roles/static/files/50-docs.openstack.org.conf b/playbooks/roles/static/files/50-docs.openstack.org.conf index d9812d5d09..5c4cd8bf74 100644 --- a/playbooks/roles/static/files/50-docs.openstack.org.conf +++ b/playbooks/roles/static/files/50-docs.openstack.org.conf @@ -27,7 +27,6 @@ DocumentRoot /afs/openstack.org/docs Options Indexes FollowSymLinks MultiViews - Satisfy any Require all granted AllowOverride None # Allow mod_rewrite rules diff --git a/playbooks/roles/static/files/50-docs.starlingx.io.conf b/playbooks/roles/static/files/50-docs.starlingx.io.conf index ba666dfe6c..7f2455ee79 100644 --- a/playbooks/roles/static/files/50-docs.starlingx.io.conf +++ b/playbooks/roles/static/files/50-docs.starlingx.io.conf @@ -27,7 +27,6 @@ DocumentRoot /afs/openstack.org/project/starlingx.io/www Options Indexes FollowSymLinks MultiViews - Satisfy any Require all granted AllowOverride None # Allow mod_rewrite rules diff --git a/playbooks/roles/static/files/50-governance.openstack.org.conf b/playbooks/roles/static/files/50-governance.openstack.org.conf index 8fcfaa9757..ce81817f27 100644 --- a/playbooks/roles/static/files/50-governance.openstack.org.conf +++ b/playbooks/roles/static/files/50-governance.openstack.org.conf @@ -45,42 +45,36 @@ Define AFS_ROOT /afs/openstack.org/project/governance.openstack.org Options Indexes FollowSymLinks MultiViews AllowOverrideList Redirect RedirectMatch - Satisfy Any Require all granted Options Indexes FollowSymLinks MultiViews AllowOverrideList Redirect RedirectMatch - Satisfy Any Require all granted Options Indexes FollowSymLinks MultiViews AllowOverrideList Redirect RedirectMatch - Satisfy Any Require all granted Options Indexes FollowSymLinks MultiViews AllowOverrideList Redirect RedirectMatch - Satisfy Any Require all granted Options Indexes FollowSymLinks MultiViews AllowOverrideList Redirect RedirectMatch - Satisfy Any Require all granted Options Indexes FollowSymLinks MultiViews AllowOverride None - Satisfy Any Require all granted Header set Cache-Control "private, no-cache, no-store, proxy-revalidate, no-transform" diff --git a/playbooks/roles/static/files/50-releases.openstack.org.conf b/playbooks/roles/static/files/50-releases.openstack.org.conf index d55221abc0..c530eda8b5 100644 --- a/playbooks/roles/static/files/50-releases.openstack.org.conf +++ b/playbooks/roles/static/files/50-releases.openstack.org.conf @@ -28,7 +28,6 @@ Define AFS_ROOT /afs/openstack.org/project/releases.openstack.org Options Indexes FollowSymLinks MultiViews AllowOverrideList Redirect RedirectMatch - Satisfy Any Require all granted diff --git a/playbooks/roles/static/files/50-security.openstack.org.conf b/playbooks/roles/static/files/50-security.openstack.org.conf index 2805d6632b..d00da91167 100644 --- a/playbooks/roles/static/files/50-security.openstack.org.conf +++ b/playbooks/roles/static/files/50-security.openstack.org.conf @@ -28,7 +28,6 @@ Define AFS_ROOT /afs/openstack.org/project/security.openstack.org Options Indexes FollowSymLinks MultiViews AllowOverrideList Redirect RedirectMatch - Satisfy Any Require all granted 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 d2f0f2b6b7..34bd30f42a 100644 --- a/playbooks/roles/static/files/50-service-types.openstack.org.conf +++ b/playbooks/roles/static/files/50-service-types.openstack.org.conf @@ -28,7 +28,6 @@ Define AFS_ROOT /afs/openstack.org/project/service-types.openstack.org Options Indexes FollowSymLinks MultiViews AllowOverrideList Redirect RedirectMatch - Satisfy Any Require all granted diff --git a/playbooks/roles/static/files/50-specs.openstack.org.conf b/playbooks/roles/static/files/50-specs.openstack.org.conf index 13b67925c4..95b8470624 100644 --- a/playbooks/roles/static/files/50-specs.openstack.org.conf +++ b/playbooks/roles/static/files/50-specs.openstack.org.conf @@ -28,7 +28,6 @@ Define AFS_ROOT /afs/openstack.org/project/specs.openstack.org Options Indexes FollowSymLinks MultiViews AllowOverrideList Redirect RedirectMatch - Satisfy Any Require all granted diff --git a/playbooks/roles/static/files/50-tarballs.opendev.org.conf b/playbooks/roles/static/files/50-tarballs.opendev.org.conf index fb3b87b3a1..62dd74431b 100644 --- a/playbooks/roles/static/files/50-tarballs.opendev.org.conf +++ b/playbooks/roles/static/files/50-tarballs.opendev.org.conf @@ -271,7 +271,6 @@ Define AFS_ROOT /afs/openstack.org/project/tarballs.opendev.org Options Indexes FollowSymLinks MultiViews AllowOverrideList Redirect RedirectMatch - Satisfy Any Require all granted diff --git a/playbooks/roles/static/files/50-zuul-ci.org.conf b/playbooks/roles/static/files/50-zuul-ci.org.conf index de195f3dcb..98058f5af4 100644 --- a/playbooks/roles/static/files/50-zuul-ci.org.conf +++ b/playbooks/roles/static/files/50-zuul-ci.org.conf @@ -36,7 +36,6 @@ DocumentRoot /afs/openstack.org/project/zuul-ci.org/www Options Indexes FollowSymLinks MultiViews - Satisfy any Require all granted AllowOverride None # Allow mod_rewrite rules