apache 2.2/2.4 compatinle config

diff --git a/cacti-apache.conf b/cacti-apache.conf
index e303a7af58e7fa91f53a74f319c26b12f411691b..a79cf94e2f08cad8125c40d91732d6d2385433ba 100644 (file)
--- a/cacti-apache.conf
+++ b/cacti-apache.conf
@@ -1,4 +1,11 @@
 Alias /cacti /usr/share/cacti
 <Directory /usr/share/cacti>
-       Allow from all
+       <IfModule mod_authz_core.c>
+               # Apache 2.4
+               Require all granted
+       </IfModule>
+       <IfModule !mod_authz_core.c>
+               Order allow,deny
+               Allow from all
+       </IfModule>
 </Directory>

diff --git a/cacti.spec b/cacti.spec
index 622cb76f62c29b58373a02c697e356feb90874a0..26240ac76ebcbabfad177cc1c9c797b5e78ac4c7 100644 (file)
--- a/cacti.spec
+++ b/cacti.spec
@@ -3,7 +3,7 @@ Summary:        Cacti is a PHP frontend for rrdtool
 Summary(pl.UTF-8):     Cacti - frontend w PHP do rrdtoola
 Name:          cacti
 Version:       0.8.8a
-Release:       3
+Release:       4
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.cacti.net/downloads/%{name}-%{version}.tar.gz