diff --git a/cacti-httpd.conf b/cacti-httpd.conf
index e888f31..d3242d4 100644
--- a/cacti-httpd.conf
+++ b/cacti-httpd.conf
@@ -2,15 +2,22 @@
# Cacti: An rrd based graphing tool
#
-# Change "Allow from 127.0.0.1" to open up cacti to other network devices.
-# For example, change "Allow from 127.0.0.1" to "Allow from all".
+# Change the following ACLs to open up Cacti to other network devices.
+# For example:
+# On httpd 2.4, change "Require host localhost" to "Require all granted".
+# On httpd 2.2, change "Allow from localhost" to "Allow from all".
Alias /cacti /usr/share/cacti
- Order Deny,Allow
- Deny from all
- Allow from 127.0.0.1
+ 2.2>
+ Require host localhost
+
+
+ Order deny,allow
+ Deny from all
+ Allow from localhost
+
@@ -23,14 +30,24 @@ Alias /cacti /usr/share/cacti
-# The sections marked "deny from all" should not be modified.
-# These are in place in order to harden cacti.
+# These sections marked "Require all denied" (or "deny from all")
+# should not be modified.
+# These are in place in order to harden Cacti.
- order deny,allow
- Deny from all
+ 2.2>
+ Require all denied
+
+
+ Order deny,allow
+ Deny from all
+
- order deny,allow
- Deny from all
+ 2.2>
+ Require all denied
+
+
+ Order deny,allow
+ Deny from all
+
-
diff --git a/cacti.spec b/cacti.spec
index d48bc90..49863a9 100644
--- a/cacti.spec
+++ b/cacti.spec
@@ -1,6 +1,6 @@
Name: cacti
Version: 0.8.7i
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: An rrd based graphing tool
Group: Applications/System
@@ -114,6 +114,9 @@ fi
%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
%changelog
+* Mon Mar 26 2012 Ken Dreyer - 0.8.7i-4
+- Adjust ACLs to support httpd 2.4.
+
* Thu Jan 12 2012 Fedora Release Engineering - 0.8.7i-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild