From e9ddc2eb455a2c97b09f652137acfe02f6135aee Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 15 Oct 2020 10:07:07 -0700
Subject: [PATCH] Update mirror apache configs to 2.4 acl primitives
We don't need to keep using the old 2.2 Order, Allow, Deny, Satisfy acl
primitives because we are now running Apache 2.4 everywhere. Stick to
these as they simplify understanding of acls by being consistent.
Change-Id: I9ed4edf15f206006fd79bdef298f8ed101a7a381
---
.../roles/mirror/templates/mirror.vhost.j2 | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/playbooks/roles/mirror/templates/mirror.vhost.j2 b/playbooks/roles/mirror/templates/mirror.vhost.j2
index 906f5dee96..5e37fc6ca7 100644
--- a/playbooks/roles/mirror/templates/mirror.vhost.j2
+++ b/playbooks/roles/mirror/templates/mirror.vhost.j2
@@ -33,12 +33,7 @@ ErrorLogFormat "[%{cu}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] %M% , \
<Directory /var/www/mirror>
Options Indexes FollowSymLinks MultiViews
AllowOverride None
- Order allow,deny
- allow from all
- Satisfy any
- <IfVersion >= 2.4>
- Require all granted
- </IfVersion>
+ Require all granted
</Directory>
# Caching reverse proxy for things that don't make sense in AFS
@@ -153,8 +148,7 @@ ErrorLogFormat "[%{cu}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] %M% , \
<Macro ProxyMirror $port>
# Disable directory listing by default.
<Directory />
- Order Deny,Allow
- Deny from all
+ Require all denied
Options None
AllowOverride None
</Directory>
@@ -328,8 +322,7 @@ ErrorLogFormat "[%{cu}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] %M% , \
<Macro Dockerv2Mirror $port>
# Disable directory listing by default.
<Directory />
- Order Deny,Allow
- Deny from all
+ Require all denied
Options None
AllowOverride None
</Directory>
@@ -397,8 +390,7 @@ ErrorLogFormat "[%{cu}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] %M% , \
<Macro RHRegistryMirror $port>
# Disable directory listing by default.
<Directory />
- Order Deny,Allow
- Deny from all
+ Require all denied
Options None
AllowOverride None
</Directory>
@@ -463,8 +455,7 @@ ErrorLogFormat "[%{cu}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] %M% , \
# Disable directory listing by default.
<Directory />
- Order Deny,Allow
- Deny from all
+ Require all denied
Options None
AllowOverride None
</Directory>