commit 8924835bafca85f5243176d3c10c441891e411bd
Author: Jeremy Stanley <fungi@yuggoth.org>
Date:   Fri Oct 16 16:15:00 2020 +0000

    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

diff --git a/playbooks/roles/static/files/00-static.opendev.org.conf b/playbooks/roles/static/files/00-static.opendev.org.conf
index 91bc680..4ce316b 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/
   <Directory ${AFS_ROOT}>
     Options Indexes FollowSymLinks MultiViews
     AllowOverrideList Redirect RedirectMatch
-    Satisfy Any
     Require all granted
   </Directory>
 
diff --git a/playbooks/roles/static/files/50-developer.openstack.org.conf b/playbooks/roles/static/files/50-developer.openstack.org.conf
index 502f430..8be9373 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
     <Directory /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 db1d04b..d556e53 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
   <Directory ${AFS_ROOT}/docs>
     Options Indexes FollowSymLinks MultiViews
     AllowOverrideList Redirect RedirectMatch
-    Satisfy Any
     Require all granted
   </Directory>
 
diff --git a/playbooks/roles/static/files/50-docs.opendev.org.conf b/playbooks/roles/static/files/50-docs.opendev.org.conf
index 288a432..f82af76 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
     <Directory /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 d9812d5..5c4cd8b 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
     <Directory /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 ba666df..7f2455e 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
     <Directory /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 8fcfaa9..ce81817 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
   <Directory ${AFS_ROOT}/election>
     Options Indexes FollowSymLinks MultiViews
     AllowOverrideList Redirect RedirectMatch
-    Satisfy Any
     Require all granted
   </Directory>
 
   <Directory ${AFS_ROOT}/governance>
     Options Indexes FollowSymLinks MultiViews
     AllowOverrideList Redirect RedirectMatch
-    Satisfy Any
     Require all granted
   </Directory>
 
   <Directory ${AFS_ROOT}/ideas>
     Options Indexes FollowSymLinks MultiViews
     AllowOverrideList Redirect RedirectMatch
-    Satisfy Any
     Require all granted
   </Directory>
 
   <Directory ${AFS_ROOT}/sigs>
     Options Indexes FollowSymLinks MultiViews
     AllowOverrideList Redirect RedirectMatch
-    Satisfy Any
     Require all granted
   </Directory>
 
   <Directory ${AFS_ROOT}/tc>
     Options Indexes FollowSymLinks MultiViews
     AllowOverrideList Redirect RedirectMatch
-    Satisfy Any
     Require all granted
   </Directory>
 
   <Directory ${AFS_ROOT}/badges>
     Options Indexes FollowSymLinks MultiViews
     AllowOverride None
-    Satisfy Any
     Require all granted
     <IfModule mod_headers.c>
         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 d55221a..c530eda 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
   <Directory ${AFS_ROOT}>
     Options Indexes FollowSymLinks MultiViews
     AllowOverrideList Redirect RedirectMatch
-    Satisfy Any
     Require all granted
   </Directory>
 
diff --git a/playbooks/roles/static/files/50-security.openstack.org.conf b/playbooks/roles/static/files/50-security.openstack.org.conf
index 2805d66..d00da91 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
   <Directory ${AFS_ROOT}>
     Options Indexes FollowSymLinks MultiViews
     AllowOverrideList Redirect RedirectMatch
-    Satisfy Any
     Require all granted
   </Directory>
 
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 d2f0f2b..34bd30f 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
   <Directory ${AFS_ROOT}>
     Options Indexes FollowSymLinks MultiViews
     AllowOverrideList Redirect RedirectMatch
-    Satisfy Any
     Require all granted
   </Directory>
 
diff --git a/playbooks/roles/static/files/50-specs.openstack.org.conf b/playbooks/roles/static/files/50-specs.openstack.org.conf
index 13b6792..95b8470 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
   <Directory ${AFS_ROOT}>
     Options Indexes FollowSymLinks MultiViews
     AllowOverrideList Redirect RedirectMatch
-    Satisfy Any
     Require all granted
   </Directory>
 
diff --git a/playbooks/roles/static/files/50-tarballs.opendev.org.conf b/playbooks/roles/static/files/50-tarballs.opendev.org.conf
index fb3b87b..62dd744 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
   <Directory ${AFS_ROOT}>
     Options Indexes FollowSymLinks MultiViews
     AllowOverrideList Redirect RedirectMatch
-    Satisfy Any
     Require all granted
   </Directory>
 
diff --git a/playbooks/roles/static/files/50-zuul-ci.org.conf b/playbooks/roles/static/files/50-zuul-ci.org.conf
index de195f3..98058f5 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
     <Directory /afs/openstack.org/project/zuul-ci.org/www>
         Options Indexes FollowSymLinks MultiViews
-        Satisfy any
         Require all granted
         AllowOverride None
         # Allow mod_rewrite rules