commit 56dfe1fd9e065edf5c6ba1b2fa81232e092e55d5
Author: Elan Ruusamäe <[email protected]>
Date:   Wed Jun 26 13:10:13 2013 +0300

    apache 2.2/2.4 compatinle config

 cacti-apache.conf | 9 ++++++++-
 cacti.spec        | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/cacti.spec b/cacti.spec
index 622cb76..26240ac 100644
--- 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
diff --git a/cacti-apache.conf b/cacti-apache.conf
index e303a7a..a79cf94 100644
--- 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>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cacti.git/commitdiff/56dfe1fd9e065edf5c6ba1b2fa81232e092e55d5

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to