From 08977c3550ebd1263375b586bd9bb4dbb8074ae5 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec@redhat.com>
Date: Mon, 26 Nov 2012 13:01:27 +0100
Subject: fix broken configuration for httpd 2.4

rhbz#871385
---
 collectd-httpd.conf | 8 ++++++++
 collectd.spec       | 1 +
 2 files changed, 9 insertions(+)

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
-- 
cgit