[phpPgAdmin] Upgrade apache config (bz #871456)
Remi Collet
remi at fedoraproject.org
Fri Jan 4 14:20:57 UTC 2013
commit 4934879140c731932632b800de6a062544f04e0b
Author: Johan Cwiklinski <johan at x-tnd.be>
Date: Sun Dec 2 09:31:42 2012 +0100
Upgrade apache config (bz #871456)
phpPgAdmin.conf | 18 +++++++++++++-----
phpPgAdmin.spec | 5 ++++-
2 files changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/phpPgAdmin.conf b/phpPgAdmin.conf
index d4f05ed..b39824f 100644
--- a/phpPgAdmin.conf
+++ b/phpPgAdmin.conf
@@ -6,10 +6,18 @@
Alias /phpPgAdmin /usr/share/phpPgAdmin
<Location /phpPgAdmin>
- 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.com
+ </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/phpPgAdmin.spec b/phpPgAdmin.spec
index 1ddd755..6997948 100644
--- a/phpPgAdmin.spec
+++ b/phpPgAdmin.spec
@@ -1,7 +1,7 @@
Summary: Web-based PostgreSQL administration
Name: phpPgAdmin
Version: 5.0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+ and (LGPLv2+ or BSD) and ASL 2.0 and MIT
Group: Applications/Databases
URL: http://phppgadmin.sourceforge.net/
@@ -87,6 +87,9 @@ rm -rf %{buildroot}
%{_phppgadmindir}/conf/config.inc.php*
%changelog
+* Sun Dec 02 2012 Johan Cwiklinski <johan AT x-tnd DOT be> - 5.0.4-3
+- Update apache configuration file for httpd 2.4
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list