quickinstall + fetchmail + sql for postfix + central configfiles

1 files changed, 17 insertions, 31 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f6d8472aa7d4..b832ed2b3f0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@ pkgname='zarafa-postfixadmin'
 replaces=('zarafa-postfixadmin-worker')
 groups=('zarafa'
 	'kopano')
-pkgver=0.24
-pkgrel=96
+pkgver=0.38
+pkgrel=1
 pkgdesc="A web based interface used to manage mailboxes, virtual domains and aliases created for Zarafa-Server with DB-Plugin and Postfix"
 arch=('any')
 license=('GPL')
@@ -26,6 +26,8 @@ depends=('bash'
 	 )
 makedepends=('git')
 install="install"
+backup=('etc/webapps/zarafa-postfixadmin/config.local.php'
+	'etc/mail/postfixadmin/fetchmail.conf')
 source=("postfixadmin-${_postfixadminver}.tar.gz::http://downloads.sourceforge.net/postfixadmin/postfixadmin-${_postfixadminver}.tar.gz"
 	"zarafa-postfixadmin-${pkgver}::git+https://git.pietma.com/pietma/com-pietma-${pkgname}.git#tag=v${pkgver}")
 md5sums=('d9a0e19bdb3241411cac8446d511fdb4'
@@ -36,17 +38,19 @@ package_zarafa-postfixadmin() {
     ###
     _destdir_webapp=${pkgdir}/usr/share/webapps/${pkgname}
     _destdir_etc=${pkgdir}/etc/webapps/${pkgname}
-    _destdir_fetchmailpostfixadmin=${pkgdir}/etc/mail/postfixadmin
     _destdir_doc=${pkgdir}/usr/share/doc/${pkgname}
     _destdir_var=${pkgdir}/var/lib/${pkgname}
     _destdir_usr=${pkgdir}/usr/share/${pkgname}
     _destdir_systemd=${pkgdir}/usr/lib/systemd/system
+    _destdir_php=${pkgdir}/etc/php
     
-    install -dm755 ${_destdir_fetchmailpostfixadmin}
     install -dm755 ${_destdir_webapp}
     install -dm755 ${_destdir_etc}
     install -dm755 ${_destdir_doc}
     install -dm755 ${_destdir_var}
+    install -dm755 ${_destdir_usr}
+    install -dm755 ${_destdir_systemd}
+    install -dm755 ${_destdir_php}
 
     # usr
     cd ${srcdir}/postfixadmin-${_postfixadminver}
@@ -60,41 +64,23 @@ package_zarafa-postfixadmin() {
 
     # docs
     mv ${_destdir_webapp}/{*.TXT,tests,ADDITIONS,DOCUMENTS,VIRTUAL_VACATION} ${_destdir_doc}
+    # Fetchmail is integral part of ZPA now
+    rm ${_destdir_doc}/ADDITIONS/fetchmail.pl
     rm -rf ${_destdir_webapp}/debian
 
     # etc
     cp ${_destdir_webapp}/config.inc.php ${_destdir_etc}/config.php.example
 
-    # ZARAFA-POSTFIXADMIN
-    ###
-    cd ${srcdir}/zarafa-postfixadmin-${pkgver}
-    cp webapp/config.local.php ${_destdir_webapp}
-    
-    # etc
-    cp etc/nginx-location.conf ${_destdir_etc}
-    cp etc/config.local.php ${_destdir_etc}/config.local.php.example
-    cp etc/fetchmail.conf ${_destdir_fetchmailpostfixadmin}/fetchmail.conf.example
-    
-    # docs
-    cp -r doc/* ${_destdir_doc}
-
-    ## php
-    mkdir -p ${pkgdir}/etc/php/conf.d
-    cp etc/php.ini ${pkgdir}/etc/php/conf.d/${pkgname}.ini
 
-    ## php-fpm
-    mkdir -p ${pkgdir}/etc/php/fpm.d
-    cp etc/php-fpm.conf ${pkgdir}/etc/php/fpm.d/${pkgname}.conf
-
-
-    # ZARAFA-POSTFIXADMIN-WORKER
+    # POSTFIXADMIN ENRICHMENT / ZARAFA-POSTFIXADMIN
     ###
-    install -dm755 ${_destdir_usr}
-    install -dm755 ${_destdir_systemd}
+    cd ${srcdir}/zarafa-postfixadmin-${pkgver}
 
-    # systemd
-    cp systemd/* ${_destdir_systemd}
+    cp -r php/* ${_destdir_php}
+    cp -rf webapp/* ${_destdir_webapp}
+    cp -r etc/* ${_destdir_etc}
+    cp -r doc/* ${_destdir_doc}
     
-    # usr
+    cp systemd/* ${_destdir_systemd}
     cp usr/* ${_destdir_usr}
 }