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

diff --git a/debian/postinst b/debian/postinst
index 6ecc8f6..dd1bf13 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -46,15 +46,18 @@ 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
+
+  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' \
 		   /etc/dovecot/conf.d/10-ssl.conf || true
   cp_check_and_sed '#ssl_key = </etc/dovecot/private/dovecot.pem' \
 		   's|#ssl_key = </etc/dovecot/private/dovecot.pem|ssl_key = </etc/dovecot/private/dovecot.pem|g' \
 		   /etc/dovecot/conf.d/10-ssl.conf || true
-
-  echo "CN: Generating certificate and key..."
-  /usr/share/dovecot-cn/mkcert.sh > /dev/null
 fi
 
 
@@ -65,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#