[postgresql-pgpoolAdmin] fix configuration file for httpd 2.4, #871468

Remi Collet remi at fedoraproject.org
Mon Jan 7 12:59:15 UTC 2013


commit dfbfb1b7714f52118041cd14d2c96e3521e1bde5
Author: Remi Collet <remi at fedoraproject.org>
Date:   Mon Jan 7 13:59:08 2013 +0100

    fix configuration file for httpd 2.4, #871468

 postgresql-pgpoolAdmin.conf |   18 +++++++++++++-----
 postgresql-pgpoolAdmin.spec |    5 ++++-
 2 files changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/postgresql-pgpoolAdmin.conf b/postgresql-pgpoolAdmin.conf
index 8be845b..fbb65bd 100644
--- a/postgresql-pgpoolAdmin.conf
+++ b/postgresql-pgpoolAdmin.conf
@@ -6,10 +6,18 @@
 Alias /pgpoolAdmin /usr/share/postgresql-pgpoolAdmin
 
 <Location /pgpoolAdmin>
-    Order deny,allow
-    Deny from all
-    Allow from 127.0.0.1
-    Allow from ::1
-    # Allow from .example.com
+    <IfModule mod_authz_core.c>
+        # Apache 2.4
+        Require local
+        # Require host example.org
+    </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>
 </Location>
 
diff --git a/postgresql-pgpoolAdmin.spec b/postgresql-pgpoolAdmin.spec
index e3867d9..b745660 100644
--- a/postgresql-pgpoolAdmin.spec
+++ b/postgresql-pgpoolAdmin.spec
@@ -3,7 +3,7 @@
 Summary:	PgpoolAdmin - web-based pgpool administration
 Name:		postgresql-pgpoolAdmin
 Version:	3.1.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	BSD
 Group:		Applications/Databases
 URL:		http://www.pgpool.net/
@@ -79,6 +79,9 @@ fi
 %{_pgpoolAdmindir}/screen.css
 
 %changelog
+* Mon Jan  7 2013 Remi Collet <rcollet at redhat.com> - 3.1.1-3
+- fix configuration file for httpd 2.4, #871468
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list