X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=dovecot-cn.git;a=blobdiff_plain;f=debian%2Fpostinst;fp=debian%2Fpostinst;h=c399682aa5fa38621a5d8cb49a8af4e52b443516;hp=1caedc80a59a272cc85807ef55d4e3481dbe1ab7;hb=35eba748d385bf2d69bd7dc8bcf4d5eb4f0e6b13;hpb=878b239bbaf158f89da80f5a87fcbe2441a05f68

diff --git a/debian/postinst b/debian/postinst
index 1caedc8..c399682 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -33,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
@@ -64,11 +69,26 @@ 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
+
+# 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