X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=dovecot-cn.git;a=blobdiff_plain;f=debian%2Fpostinst;h=dd1bf13ddad709aed8e6ba5a18b396a015cd6008;hp=4cc3cb336e4d205441966b7399407592386a58ec;hb=61e2c36a2ade8df3ec5239ba9c069e14e64f0b56;hpb=6d2014011d422a5cd4d0a4de254a000a5e7a84ec

diff --git a/debian/postinst b/debian/postinst
index 4cc3cb3..dd1bf13 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -47,8 +47,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 +68,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#