summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Pevec <apevec@redhat.com>2012-11-26 13:01:27 +0100
committerAlan Pevec <apevec@redhat.com>2012-11-26 13:01:27 +0100
commit08977c3550ebd1263375b586bd9bb4dbb8074ae5 (patch)
tree2303d841cf70eead0e6e7ea6a5bbc0999950b5c6
parentc3cb39d2b09eaa1ba361b3864032595d95844f4e (diff)
downloadcollectd-08977c3550ebd1263375b586bd9bb4dbb8074ae5.tar.gz
collectd-08977c3550ebd1263375b586bd9bb4dbb8074ae5.tar.xz
collectd-08977c3550ebd1263375b586bd9bb4dbb8074ae5.zip
fix broken configuration for httpd 2.4
rhbz#871385
-rw-r--r--collectd-httpd.conf8
-rw-r--r--collectd.spec1
2 files changed, 9 insertions, 0 deletions
diff --git a/collectd-httpd.conf b/collectd-httpd.conf
index a9fe956..1117157 100644
--- a/collectd-httpd.conf
+++ b/collectd-httpd.conf
@@ -6,7 +6,15 @@ Alias /collectd/ /usr/share/collectd/collection3/
<Directory /usr/share/collectd/>
AddHandler cgi-script .cgi
DirectoryIndex bin/index.cgi
+ <IfModule mod_authz_core.c>
+ # Apache 2.4
+ Require local
+ </IfModule>
+ <IfModule !mod_authz_core.c>
+ # Apache 2.2
Order Deny,Allow
Deny from all
Allow from 127.0.0.1
+ Allow from ::1
+ </IfModule>
</Directory>
diff --git a/collectd.spec b/collectd.spec
index 60b4d44..733c369 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -659,6 +659,7 @@ fi
- update to 5.1.1
- spec cleanups from Ruben Kerkhof
- fix postgresql_default.conf location rhbz#681615
+- fix broken configuration for httpd 2.4 rhbz#871385
* Mon Nov 19 2012 Alan Pevec <apevec@redhat.com> 5.0.5-1
- new upstream version 5.0.5