summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD48
-rw-r--r--install64
3 files changed, 78 insertions, 44 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9653bba70636..d282d5b5dba3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Dec 6 19:39:48 UTC 2016
+# Tue Dec 13 00:39:07 UTC 2016
pkgbase = zarafa-postfixadmin
pkgdesc = A web based interface used to manage mailboxes, virtual domains and aliases created for Zarafa-Server with DB-Plugin and Postfix
- pkgver = 0.24
- pkgrel = 96
+ pkgver = 0.38
+ pkgrel = 1
url = https://git.pietma.com/pietma/com-pietma-zarafa-postfixadmin
install = install
arch = any
@@ -21,8 +21,10 @@ pkgbase = zarafa-postfixadmin
depends = perl-dbd-mysql
depends = perl-lockfile-simple
replaces = zarafa-postfixadmin-worker
+ backup = etc/webapps/zarafa-postfixadmin/config.local.php
+ backup = etc/mail/postfixadmin/fetchmail.conf
source = postfixadmin-2.93.tar.gz::http://downloads.sourceforge.net/postfixadmin/postfixadmin-2.93.tar.gz
- source = zarafa-postfixadmin-0.24::git+https://git.pietma.com/pietma/com-pietma-zarafa-postfixadmin.git#tag=v0.24
+ source = zarafa-postfixadmin-0.38::git+https://git.pietma.com/pietma/com-pietma-zarafa-postfixadmin.git#tag=v0.38
md5sums = d9a0e19bdb3241411cac8446d511fdb4
md5sums = SKIP
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}
}
diff --git a/install b/install
index c268fa9e81b8..e80ead9c584e 100644
--- a/install
+++ b/install
@@ -13,19 +13,65 @@ function installdir() {
find $directory -type d -exec chmod "$moddir" {} \;
}
-post_install() {
- systemd-sysusers
- systemd-tmpfiles --create
-
+function installbasics() {
+ # var
# template cache needs to be writeable
installdir http:http 0700 0600 /var/lib/zarafa-postfixadmin
# etc
_etc=/etc/webapps/zarafa-postfixadmin
- installdir http:http 0700 0600 ${_etc}
- install --backup=simple --suffix .pacsave -o http -g http -m 0600 ${_etc}/config.local.php.example ${_etc}/config.local.php
+ cp -rn /usr/share/doc/zarafa-postfixadmin/example-config/* ${_etc}
+
+ installdir root:root 0755 0655 ${_etc}
+ installdir postfix:postfix 0700 0600 ${_etc}/postfix
+
+ chown http:http ${_etc}/config.local.php
+ chmod 0600 ${_etc}/config.local.php
+
+ chown fetchmail:nobody ${_etc}/fetchmail.conf
+ chmod 0600 ${_etc}/fetchmail.conf
+}
+
+post_install() {
+ systemd-sysusers
+ systemd-tmpfiles --create
+
+ installbasics
- # fetchmail
- installdir fetchmail:fetchmail 0700 0600 /etc/mail/postfixadmin
- install --backup=simple --suffix .pacsave -o fetchmail -g fetchmail -m 0600 /etc/mail/postfixadmin/fetchmail.conf.example /etc/mail/postfixadmin/fetchmail.conf
+ echo
+ echo "Please install Zarafa-Postfixadmin:"
+ echo
+ echo " $ /usr/share/doc/zarafa-postfixadmin/install.sh"
+ echo
+ echo "Read More"
+ echo
+ echo " https://wiki.archlinux.org/index.php/MySQL"
+ echo " https://pietma.com/install-run-and-access-zarafa-postfix-admin/"
+ echo
+}
+
+pre_upgrade() {
+ if [[ -e "/etc/mail/postfixadmin/fetchmail.conf" ]];
+ then
+ echo
+ echo "mv /etc/mail/postfixadmin/fetchmail.conf /etc/webapps/zarafa-postfixadmin/fetchmail.conf"
+ mv /etc/mail/postfixadmin/fetchmail.conf /etc/webapps/zarafa-postfixadmin/fetchmail.conf
+
+ echo "chown fetchmail:nobody /etc/webapps/zarafa-postfixadmin/fetchmail.conf"
+ chown fetchmail:nobody /etc/webapps/zarafa-postfixadmin/fetchmail.conf
+
+ echo "chmod 0600 /etc/webapps/zarafa-postfixadmin/fetchmail.conf"
+ chmod 0600 /etc/webapps/zarafa-postfixadmin/fetchmail.conf
+ echo
+ fi
+}
+
+post_upgrade() {
+ echo
+ echo "Please open the setup page. The database is updated during opening. No login needed!"
+ echo
+ echo " https://YOUR_HOSTNAME/zarafa-postfixadmin/setup.php"
+ echo
+
+ installbasics
} \ No newline at end of file