[apcupsd/f18] fix configuration for httpd 2.4 (#871361)

[Michal Hlavinka]

commit 76a361cac78760d088ad0c6de4cde61f4dd1bec2
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Tue Oct 30 13:45:42 2012 +0100

    fix configuration for httpd 2.4 (#871361)

 apcupsd-httpd.conf |    8 +++++++-
 apcupsd.spec       |    5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/apcupsd-httpd.conf b/apcupsd-httpd.conf
index 973dec9..26a5191 100644
--- a/apcupsd-httpd.conf
+++ b/apcupsd-httpd.conf
@@ -18,9 +18,15 @@ Alias /apcupsd /var/www/apcupsd
     DirectoryIndex upsstats.cgi
     AllowOverride None
     Options ExecCGI Indexes
+  <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
-    # Allow from .example.com
+  </IfModule>
 </Directory>
diff --git a/apcupsd.spec b/apcupsd.spec
index 98cb1a7..185e173 100644
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -1,6 +1,6 @@
 Name:         apcupsd
 Version:      3.14.10
-Release:      6%{?dist}
+Release:      7%{?dist}
 Summary:      APC UPS Power Control Daemon for Linux
 
 Group:        System Environment/Daemons
@@ -184,6 +184,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Oct 30 2012 Michal Hlavinka <mhlavink at redhat.com> - 3.14.10-7
+- fix configuration for httpd 2.4 (#871361)
+
 * Fri Aug 24 2012 Michal Hlavinka <mhlavink at redhat.com> - 3.14.10-6
 - scriptlets replaced with new systemd macros (#851227)