From e5862ccf2e6cd3633fb28ccfd8d27f0f1bd42c19 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mon, 23 Jun 2014 19:08:46 +0000
Subject: [PATCH] Adjust download apache conf to work with 2.2 or 2.4

---
 .../httpd/dl.fedoraproject.org/secondary.conf | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf b/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf
index 15dd4f7822..3475a2a9ef 100644
--- a/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf
+++ b/roles/download/files/httpd/dl.fedoraproject.org/secondary.conf
@@ -2,12 +2,31 @@ Alias /pub /srv/pub
 
 DocumentRoot /srv/web
 
+
 <Directory /srv/pub>
-  Options Indexes FollowSymLinks
   HeaderName /HEADER.html
   ReadmeName /FOOTER.html
+  Options Indexes FollowSymLinks
+  <IfModule mod_authz_core.c>
+    # Apache 2.4
+    Require all granted
+  </IfModule>
+  <IfModule !mod_authz_core.c>
+    # Apache 2.2
+    Order allow,deny
+    Allow from all
+  </IfModule>
 </Directory>
 
 <Directory /srv/pub/archive>
   ReadmeName /pub/archive/README.html
+  <IfModule mod_authz_core.c>
+    # Apache 2.4
+    Require all granted
+  </IfModule>
+  <IfModule !mod_authz_core.c>
+    # Apache 2.2
+    Order allow,deny
+    Allow from all
+  </IfModule>
 </Directory>