Properly support Apache 2.2 and 2.4

Can be done by using <IfModule> directive. Tested on fc20, el7 and Wheezy. refs #6771
Icinga · Aug 12, 2014 · 143db97 · 143db97
1 parent d813bad
commit 143db97
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/etc/apache/icingaweb.conf.in b/etc/apache/icingaweb.conf.in
@@ -3,10 +3,19 @@ Alias @web_path@ "@prefix@/public"
 <Directory "@prefix@/public">
     Options SymLinksIfOwnerMatch
     AllowOverride None
-    Order allow,deny
-    Allow from all
-    # new directive needed in Apache 2.4.3+
-    #Require all granted
+
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        <RequireAll>
+            Require all granted
+        </RequireAll>
+    </IfModule>
+
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order allow,deny
+        Allow from all
+    </IfModule>
 
     SetEnv ICINGAWEB_CONFIGDIR @icingaweb_config_path@