[packages/postfixadmin] - migrated to apache 2.4

baggins baggins at pld-linux.org
Thu May 16 22:05:21 CEST 2013


commit 24e4ebfa26135578c09e35fd45e849486d4c6efd
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu May 16 22:05:20 2013 +0200

    - migrated to apache 2.4

 postfixadmin.conf | 8 ++++----
 postfixadmin.spec | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/postfixadmin.spec b/postfixadmin.spec
index 238a87f..180fe6f 100644
--- a/postfixadmin.spec
+++ b/postfixadmin.spec
@@ -1,5 +1,5 @@
 # TODO
-# - webapps support: apache1, lighttpd
+# - webapps support: lighttpd
 # - find nice way to split it into 3 parts: user, admin and common
 # - package css and templates as config.
 # - put config part of vacation.pl into separate file (there is configuration part in that).
@@ -9,7 +9,7 @@ Summary:	Web Based Management tool created for Postfix
 Summary(pl.UTF-8):	Narzędzie WWW do zarządzania Postfiksem
 Name:		postfixadmin
 Version:	2.3.5
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Networking/Mail
 Source0:	http://downloads.sourceforge.net/project/postfixadmin/postfixadmin/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -28,6 +28,7 @@ Requires:	webserver(alias)
 Requires:	webserver(php)
 Suggests:	php(imap)
 Suggests:	webserver(indexfile)
+Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -126,10 +127,10 @@ if [ "$1" = "0" ]; then
 	%groupremove vacation
 fi
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
 %webapp_register httpd %{_webapp}
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %files
diff --git a/postfixadmin.conf b/postfixadmin.conf
index ac074f7..40f0a5b 100644
--- a/postfixadmin.conf
+++ b/postfixadmin.conf
@@ -1,12 +1,12 @@
-Alias		/postfixadmin	/usr/share/postfixadmin
+Alias	/postfixadmin	/usr/share/postfixadmin
 
 <Directory /usr/share/postfixadmin>
 	AllowOverride None
-	Order allow,deny
-	Allow from all
+	Require all granted
 	php_admin_value open_basedir "/etc/webapps/postfixadmin/:/usr/share/postfixadmin/"
 #	NOTE: /tmp access required for creating backups
 </Directory>
+
 <Directory /usr/share/postfixadmin/admin>
 	AuthUserFile /etc/webapps/postfixadmin/htpasswd
 	AuthGroupFile /dev/null
@@ -14,6 +14,6 @@ Alias		/postfixadmin	/usr/share/postfixadmin
 	AuthType Basic
 
 	<limit GET POST>
-		require valid-user
+		Require valid-user
 	</limit>
 </Directory>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/postfixadmin.git/commitdiff/24e4ebfa26135578c09e35fd45e849486d4c6efd



More information about the pld-cvs-commit mailing list