apache multiversion config

diff --git a/apache.conf b/apache.conf
index 2c36f4f85bcf6cb59d168956497d408e936e49aa..26095fbd056396115d526597aba0651d0523a94f 100644 (file)
--- a/apache.conf
+++ b/apache.conf
@@ -1,12 +1,31 @@
 Alias /bacula-web/cache/ /var/cache/bacula-web/
 Alias /bacula-web /usr/share/bacula-web
+
 <Directory /usr/share/bacula-web>
-       allow from all
+       # Apache < 2.4
+       <IfModule !mod_authz_core.c>
+               Order allow,deny
+               Allow from all
+       </IfModule>
+       # Apache 2.4
+       <IfModule mod_authz_core.c>
+               Require all granted
+       </IfModule>
 </Directory>
 
 <Directory /var/cache/bacula-web>
-       deny from all
-       <Files *.png>
-               allow from all
-       </Files>
+       # Apache < 2.4
+       <IfModule !mod_authz_core.c>
+               Deny from all
+               <Files *.png>
+                       Allow from all
+               </Files>
+       </IfModule>
+       # Apache 2.4
+       <IfModule mod_authz_core.c>
+               Require all denied
+               <Files *.png>
+                       Require all granted
+               </Files>
+       </IfModule>
 </Directory>

diff --git a/bacula-web.spec b/bacula-web.spec
index 48302bb6dcf7c2acbb3b29aea38db317a32fe0fe..7fe47f7d01ec11f9163c8be394c962839858b9db 100644 (file)
--- a/bacula-web.spec
+++ b/bacula-web.spec
@@ -5,7 +5,7 @@
 Summary:       Open source monitoring and reporting tool for Bacula
 Name:          bacula-web
 Version:       5.2.12
-Release:       3
+Release:       4
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.bacula-web.org/tl_files/downloads/%{name}-%{version}.tar.gz