Adjust httpd ACL conditionals to test the presence of mod_authz_core

(as discussed on fedora-devel)
This commit is contained in:
Ken Dreyer 2012-04-06 09:59:08 -06:00
parent 99b73ddc76
commit 12e71f16d6
2 changed files with 20 additions and 14 deletions

View File

@ -10,14 +10,16 @@
Alias /cacti /usr/share/cacti Alias /cacti /usr/share/cacti
<Directory /usr/share/cacti/> <Directory /usr/share/cacti/>
<IfVersion > 2.2> <IfModule mod_authz_core.c>
# httpd 2.4
Require host localhost Require host localhost
</IfVersion> </IfModule>
<IfVersion <= 2.2> <IfModule !mod_authz_core.c>
# httpd 2.2
Order deny,allow Order deny,allow
Deny from all Deny from all
Allow from localhost Allow from localhost
</IfVersion> </IfModule>
</Directory> </Directory>
<Directory /usr/share/cacti/install> <Directory /usr/share/cacti/install>
@ -30,24 +32,24 @@ Alias /cacti /usr/share/cacti
</Directory> </Directory>
# These sections marked "Require all denied" (or "deny from all") # These sections marked "Require all denied" (or "Deny from all")
# should not be modified. # should not be modified.
# These are in place in order to harden Cacti. # These are in place in order to harden Cacti.
<Directory /usr/share/cacti/log> <Directory /usr/share/cacti/log>
<IfVersion > 2.2> <IfModule mod_authz_core.c>
Require all denied Require all denied
</IfVersion> </IfModule>
<IfVersion <= 2.2> <IfModule !mod_authz_core.c>
Order deny,allow Order deny,allow
Deny from all Deny from all
</IfVersion> </IfModule>
</Directory> </Directory>
<Directory /usr/share/cacti/rra> <Directory /usr/share/cacti/rra>
<IfVersion > 2.2> <IfModule mod_authz_core.c>
Require all denied Require all denied
</IfVersion> </IfModule>
<IfVersion <= 2.2> <IfModule !mod_authz_core.c>
Order deny,allow Order deny,allow
Deny from all Deny from all
</IfVersion> </IfModule>
</Directory> </Directory>

View File

@ -1,6 +1,6 @@
Name: cacti Name: cacti
Version: 0.8.8 Version: 0.8.8
Release: 1%{?dist} Release: 2%{?dist}
Summary: An rrd based graphing tool Summary: An rrd based graphing tool
Group: Applications/System Group: Applications/System
@ -114,6 +114,10 @@ fi
%attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib %attr(0644,root,root) %{_localstatedir}/lib/%{name}/lib
%changelog %changelog
* Fri Apr 06 2012 Ken Dreyer <ktdreyer@ktdreyer.com> - 0.8.8-2
- Adjust httpd ACL conditionals to test the presence of mod_authz_core
(as discussed on fedora-devel)
* Wed Apr 04 2012 Ken Dreyer <ktdreyer@ktdreyer.com> - 0.8.8-1 * Wed Apr 04 2012 Ken Dreyer <ktdreyer@ktdreyer.com> - 0.8.8-1
- New upstream release (BZ #809753). - New upstream release (BZ #809753).