From b497664a38e806a896213c17325048bf1c6c1bd5 Mon Sep 17 00:00:00 2001
From: Pavol Babincak <pbabinca@redhat.com>
Date: Jan 21 2016 15:58:00 +0000
Subject: Configure httpd's access control automatically with IfVersion


See documentation for upgrading to 2.4:
https://httpd.apache.org/docs/2.4/upgrading.html#access

---

diff --git a/hub/httpd.conf b/hub/httpd.conf
index de3f19f..8a421c2 100644
--- a/hub/httpd.conf
+++ b/hub/httpd.conf
@@ -7,11 +7,13 @@ Alias /kojihub /usr/share/koji-hub/kojixmlrpc.py
 <Directory "/usr/share/koji-hub">
     Options ExecCGI
     SetHandler wsgi-script
-    Require all granted
-    #If you have httpd <= 2.2, you'll want the following two lines instead
-    #of the one above:
-    #Order allow,deny
-    #Allow from all
+    <IfVersion < 2.4>
+        Order allow,deny
+        Allow from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+        Require all granted
+    </IfVersion>
 </Directory>
 
 # Support for mod_python is DEPRECATED. If you still need mod_python support,
@@ -34,11 +36,13 @@ Alias /kojifiles "/mnt/koji/"
     #you will need to follow all symlinks instead, e.g.
     #Options Indexes FollowSymLinks
     AllowOverride None
-    Require all granted
-    #If you have httpd <= 2.2, you'll want the following two lines instead
-    #of the one above:
-    #Order allow,deny
-    #Allow from all
+    <IfVersion < 2.4>
+        Order allow,deny
+        Allow from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+        Require all granted
+    </IfVersion>
 </Directory>
 
 # uncomment this to enable authentication via SSL client certificates
diff --git a/www/conf/kojiweb.conf b/www/conf/kojiweb.conf
index 3173ba2..88c5b04 100644
--- a/www/conf/kojiweb.conf
+++ b/www/conf/kojiweb.conf
@@ -5,11 +5,13 @@ Alias /koji "/usr/share/koji-web/scripts/wsgi_publisher.py"
 <Directory "/usr/share/koji-web/scripts/">
     Options ExecCGI
     SetHandler wsgi-script
-    Require all granted
-    #If you have httpd <= 2.2, you'll want the following two lines instead
-    #of the one above:
-    #Order allow,deny
-    #Allow from all
+    <IfVersion < 2.4>
+        Order allow,deny
+        Allow from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+        Require all granted
+    </IfVersion>
 </Directory>
 
 # Support for mod_python is DEPRECATED. If you still need mod_python support,
@@ -54,9 +56,11 @@ Alias /koji-static/ "/usr/share/koji-web/static/"
 <Directory "/usr/share/koji-web/static/">
     Options None
     AllowOverride None
-    Require all granted
-    #If you have httpd <= 2.2, you'll want the following two lines instead
-    #of the one above:
-    #Order allow,deny
-    #Allow from all
+    <IfVersion < 2.4>
+        Order allow,deny
+        Allow from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+        Require all granted
+    </IfVersion>
 </Directory>