X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;ds=sidebyside;f=debian%2Fpostinst;h=1caedc80a59a272cc85807ef55d4e3481dbe1ab7;hb=878b239bbaf158f89da80f5a87fcbe2441a05f68;hp=4cc3cb336e4d205441966b7399407592386a58ec;hpb=6d2014011d422a5cd4d0a4de254a000a5e7a84ec;p=dovecot-cn.git

diff --git a/debian/postinst b/debian/postinst
index 4cc3cb3..1caedc8 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,4 +1,6 @@
-#!/bin/sh -e
+#!/bin/sh
+
+set -e
 
 [ "$1" = "configure" ] || exit 0
 [ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
@@ -47,8 +49,10 @@ cp_check_and_sed 'ssl = no' \
 if ! grep -q ^ssl_cert /etc/dovecot/conf.d/10-ssl.conf \
   && ! grep -q ^ssl_key /etc/dovecot/conf.d/10-ssl.conf; then
 
-  echo "CN: Generating certificate and key..."
-  /usr/share/dovecot-cn/mkcert.sh > /dev/null
+  if [ ! -f /etc/dovecot/dovecot.pem -a ! -f /etc/dovecot/private/dovecot.pem ]; then
+    echo "CN: Generating certificate and key..."
+    /usr/share/dovecot-cn/mkcert.sh || true
+  fi
 
   cp_check_and_sed '#ssl_cert = </etc/dovecot/dovecot.pem' \
 		   's|#ssl_cert = </etc/dovecot/dovecot.pem|ssl_cert = </etc/dovecot/dovecot.pem|g' \
@@ -66,11 +70,7 @@ cp_check_and_sed '#ssl_protocols =' \
 		 /etc/dovecot/conf.d/10-ssl.conf || true
 
 # restart 
-if [ -x /usr/sbin/invoke-rc.d ]; then
-  [ -x /etc/init.d/dovecot ] && invoke-rc.d dovecot restart
-else
-  [ -x /etc/init.d/dovecot ] && /etc/init.d/dovecot restart
-fi
+service dovecot restart || true
 
 #DEBHELPER#