[arch-commits] Commit in postfixadmin/trunk (PKGBUILD apache.example.conf)

[Sven-Hendrik Haase]

    Date: Thursday, July 25, 2013 @ 22:22:35
  Author: svenstaro
Revision: 94489

upgpkg: postfixadmin 2.3.6-1

Pushing postfixmadmin

Added:
  postfixadmin/trunk/apache.example.conf
Modified:
  postfixadmin/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   50 ++++++++++++++++++--------------------------------
 apache.example.conf |    8 ++++++++
 2 files changed, 26 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-25 20:20:45 UTC (rev 94488)
+++ PKGBUILD	2013-07-25 20:22:35 UTC (rev 94489)
@@ -1,25 +1,25 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
 # Contributor: Filip <fila pruda.com>
-
 pkgname=postfixadmin
 pkgver=2.3.6
-pkgrel=2
-pkgdesc="web based interface used to manage mailboxes, virtual domains and aliases created for Postfix"
+pkgrel=1
+pkgdesc="A web based interface used to manage mailboxes, virtual domains and aliases created for Postfix"
 arch=('any')
 license=('GPL')
 url="http://postfixadmin.sourceforge.net/"
-backup=(etc/webapps/postfixadmin/config.inc.php etc/webapps/postfixadmin/.htaccess
-	etc/webapps/postfixadmin/motd.txt etc/webapps/postfixadmin/motd-users.txt)
+backup=(etc/webapps/postfixadmin/config.inc.php
+        etc/webapps/postfixadmin/.htaccess
+	    etc/webapps/postfixadmin/motd.txt
+        etc/webapps/postfixadmin/motd-users.txt)
 depends=('php')
-optdepends=(	'mariadb: MySQL server'
-		'postgresql: PostgreSQL server'
-	   )
+optdepends=('mariadb: MySQL server'
+		'postgresql: PostgreSQL server')
+source=(http://downloads.sourceforge.net/project/postfixadmin/postfixadmin/postfixadmin-$pkgver/postfixadmin-$pkgver.tar.gz
+        apache.example.conf)
+md5sums=('2976aa2126747a25fa006b7be67ba9ba'
+         'dc301336210336c505f33d124ac05a7b')
 
-source=(http://downloads.sourceforge.net/project/postfixadmin/postfixadmin/postfixadmin-$pkgver/postfixadmin-$pkgver.tar.gz)
-
-md5sums=('2976aa2126747a25fa006b7be67ba9ba')
-
 package() {
-
   _destdir=$pkgdir/usr/share/webapps/postfixAdmin
   _destdir_etc=$pkgdir/etc/webapps/postfixadmin
   _destdir_doc=$pkgdir/usr/share/doc/postfixadmin
@@ -31,34 +31,20 @@
   cd $srcdir/$pkgname-$pkgver
   cp -r * ${_destdir}
   
-  #etc
+  # config
   mv ${_destdir}/config.inc.php ${_destdir_etc}
   ln -s /etc/webapps/postfixadmin/config.inc.php ${_destdir}/config.inc.php
-  echo "#deny from all" >${_destdir_etc}/.htaccess || return 1
+  echo "#deny from all" >${_destdir_etc}/.htaccess
   ln -s /etc/webapps/postfixadmin/.htaccess ${_destdir}/.htaccess
   mv ${_destdir}/motd.txt ${_destdir_etc}
   mv ${_destdir}/motd-users.txt ${_destdir_etc}
   ln -s /etc/webapps/postfixadmin/motd.txt ${_destdir}/motd.txt
   ln -s /etc/webapps/postfixadmin/motd-users.txt ${_destdir}/motd-users.txt
   
-  #move documents
-  mv ${_destdir}/*.TXT ${_destdir_doc}
-  mv ${_destdir}/tests ${_destdir_doc}
-  mv ${_destdir}/ADDITIONS ${_destdir_doc}
-  mv ${_destdir}/DOCUMENTS ${_destdir_doc}
-  mv ${_destdir}/VIRTUAL_VACATION ${_destdir_doc}
+  # docs
+  mv ${_destdir}/{*.TXT,tests,ADDITIONS,DOCUMENTS,VIRTUAL_VACATION} ${_destdir_doc}
   rm -rf ${_destdir}/debian
   
   # apache  
-  cat >${_destdir_etc}/apache.example.conf <<EOF
-        Alias /postfixAdmin "/usr/share/webapps/postfixAdmin"
-        <Directory "/usr/share/webapps/postfixAdmin">
-                AllowOverride All
-                Options FollowSymlinks
-                Order allow,deny
-                Allow from all
-		php_admin_value open_basedir "/tmp/:/usr/share/webapps/postfixAdmin/:/etc/webapps/postfixadmin/:/usr/share/pear/"
-        </Directory>
-EOF
-  
+  install ${srcdir}/apache.example.conf ${_destdir_etc}/apache.example.conf
 }

Added: apache.example.conf
===================================================================
--- apache.example.conf	                        (rev 0)
+++ apache.example.conf	2013-07-25 20:22:35 UTC (rev 94489)
@@ -0,0 +1,8 @@
+Alias /postfixAdmin "/usr/share/webapps/postfixAdmin"
+<Directory "/usr/share/webapps/postfixAdmin">
+    AllowOverride All
+    Options FollowSymlinks
+    Order allow,deny
+    Allow from all
+    php_admin_value open_basedir "/tmp/:/usr/share/webapps/postfixAdmin/:/etc/webapps/postfixadmin/:/usr/share/pear/"
+</Directory>