From 3ad6c3bc666dd9dfca4dddd24bb32fcb32ab7ace Mon Sep 17 00:00:00 2001
From: SJ <sj@acts.hu>
Date: Sun, 13 Oct 2013 22:29:45 +0200
Subject: [PATCH] more debian packaging fixes

---
 debian/changelog       | 2 +-
 debian/postinst        | 2 ++
 etc/Makefile.in        | 1 +
 util/postinstall.sh.in | 8 +++++++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4bac7ad6..16baff73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-piler (0.1.25-2) UNRELEASED; urgency=low
+piler (0.1.25-3) UNRELEASED; urgency=low
 
   * Improved deb package of piler build 845.
 
diff --git a/debian/postinst b/debian/postinst
index 8c3bf002..573e210b 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -31,6 +31,8 @@ fix_permissions() {
    chmod +s /usr/local/bin/pilerexport /usr/local/bin/pilerpurge /usr/local/bin/pilerimport /usr/local/bin/pilerget /usr/local/bin/pileraget /usr/local/bin/reindex
    chgrp piler /usr/local/etc/piler.conf
    chmod 640 /usr/local/etc/piler.conf
+
+   chown piler:piler /var/piler/imap /var/piler/sphinx /var/piler/stat
 }
 
 
diff --git a/etc/Makefile.in b/etc/Makefile.in
index 9fc37105..f8f84599 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -27,6 +27,7 @@ INSTALL = @INSTALL@
 all:
 	sed -e 's%pidfile=.*%pidfile=$(localstatedir)/run/piler/piler.pid%g' \
 	-e 's%iv=.*%iv=@iv@%g' \
+	-e '%pemfile=%pemfile=$(sysconfdir)/piler.pem%g' \
 	-e 's%workdir=.*%workdir=$(localstatedir)/piler/tmp%g' < $(srcdir)/example.conf | grep -v ^\; | grep '=' | sort > $(srcdir)/piler.conf
 
 install:
diff --git a/util/postinstall.sh.in b/util/postinstall.sh.in
index 8d540097..8a16f7d7 100755
--- a/util/postinstall.sh.in
+++ b/util/postinstall.sh.in
@@ -365,6 +365,13 @@ execute_post_install_tasks() {
 
    chmod 755 $LOCALSTATEDIR/piler/stat
 
+   if [ -d webui ]; then webui_install; fi
+
+}
+
+
+webui_install() {
+
    echo -n "Copying www files to $DOCROOT... "
    mkdir -p $DOCROOT || exit 1
 
@@ -409,7 +416,6 @@ execute_post_install_tasks() {
    echo "?>" >> $DOCROOT/config-site.php
 
    echo "Done."
-
 }