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

diff --git a/debian/postinst b/debian/postinst
index 4cc3cb3..5b18253 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
@@ -31,7 +33,12 @@ cp_check_and_sed 'pop3_client_workarounds' \
 		 /etc/dovecot/conf.d/20-pop3.conf || true
 
 cp_check_and_sed '#ssl_cipher_list' \
-                 's/#ssl_cipher_list.*/ssl_cipher_list = ALL:!aNULL:!eNULL:!ADH!LOW:!MEDIUM:!EXP:!SSLv2:HIGH/g' \
+                 's/#ssl_cipher_list.*/ssl_cipher_list = ALL:!aNULL:!eNULL:!ADH!LOW:!MEDIUM:!EXP:HIGH/g' \
+		 /etc/dovecot/conf.d/10-ssl.conf || true
+
+# izbacujemo SSLv2
+cp_check_and_sed 'ssl_cipher_list' \
+                 's/:\!SSLv2//g' \
 		 /etc/dovecot/conf.d/10-ssl.conf || true
 
 # trazio zelja
@@ -47,8 +54,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' \
@@ -56,22 +65,37 @@ if ! grep -q ^ssl_cert /etc/dovecot/conf.d/10-ssl.conf \
   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
+  # negdje se pojavljuje dovecot.key
+  cp_check_and_sed 'ssl_key = </etc/dovecot/private/dovecot.key' \
+		   's|ssl_key = </etc/dovecot/private/dovecot.key|ssl_key = </etc/dovecot/private/dovecot.pem|g' \
+		   /etc/dovecot/conf.d/10-ssl.conf || true
 fi
 
 
 
-# dodao ico, gasi stare SSL protokole
+# dodao ico, gasi SSLv3 protokol
 cp_check_and_sed '#ssl_protocols =' \
-		 's/^#ssl_protocols.*/ssl_protocols = !SSLv2 !SSLv3/g' \
+		 's/^#ssl_protocols.*/ssl_protocols = !SSLv3/g' \
 		 /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
+# dodao zelja, gasi stare SSL protokole
+cp_check_and_sed 'ssl_protocols =' \
+		 's/\!SSLv2 //g' \
+		 /etc/dovecot/conf.d/10-ssl.conf || true
+
+# dodao zelja, gasi stare SSL protokole/ciphere u 95-cn9-upgrade.conf ako postoje
+if [ -f /etc/dovecot/conf.d/95-cn9-upgrade.conf ]; then
+	cp_check_and_sed 'ssl_protocols =' \
+			 's/\!SSLv2 //g' \
+			 /etc/dovecot/conf.d/95-cn9-upgrade.conf || true
+	cp_check_and_sed 'ssl_cipher_list' \
+        	         's/:\!SSLv2//g' \
+			 /etc/dovecot/conf.d/95-cn9-upgrade.conf || true
 fi
 
+# restart 
+service dovecot restart || true
+
 #DEBHELPER#
 
 exit 0