X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=911a04ab101f8ceb552ee7f999b1a3278a6151a2;hb=5ec07b4e41e94474b7eb5294462d778533aef8e6;hp=1caedc80a59a272cc85807ef55d4e3481dbe1ab7;hpb=878b239bbaf158f89da80f5a87fcbe2441a05f68;p=dovecot-cn.git

diff --git a/debian/postinst b/debian/postinst
index 1caedc8..911a04a 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
@@ -60,14 +65,64 @@ 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 umjesto dovecot.pem
+  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
 
+### buster ima ssl_min_protocol umjesto ssl_protocols
+# ne radimo ništa ako već postoji ^ssl_min_protocol = TLS*, možda je sistemac smanjivao level TLS-a
+
+if ! grep -q "^ssl_min_protocol = TLS" /etc/dovecot/conf.d/10-ssl.conf; then
+	# postavlja minimalni TLS protokol i mijenja ime varijable
+	cp_check_and_sed '#ssl_protocols =' \
+			 's/^#ssl_protocols.*/ssl_min_protocol = TLSv1.2/g' \
+			 /etc/dovecot/conf.d/10-ssl.conf || true
+
+	# postavlja minimalni TLS protokol ako je varijabla već uključena
+	cp_check_and_sed 'ssl_protocols =' \
+			 's/^ssl_protocols.*/ssl_min_protocol = TLSv1.2/g' \
+			 /etc/dovecot/conf.d/10-ssl.conf || true
+
+	# samo popravlja inačicu protokola i uključuje varijablu
+	cp_check_and_sed '#ssl_min_protocol =' \
+			 's/^#ssl_min_protocol.*/ssl_min_protocol = TLSv1.2/g' \
+			 /etc/dovecot/conf.d/10-ssl.conf || true
+
+	# popravlja inačicu protokola ako je varijabla već uključena (ako je zaostao SSLv2 i SSLv3)
+	cp_check_and_sed 'ssl_min_protocol =' \
+			 's/^ssl_min_protocol.*/ssl_min_protocol = TLSv1.2/g' \
+			 /etc/dovecot/conf.d/10-ssl.conf || true
+fi
 
-
-# dodao ico, gasi stare SSL protokole
-cp_check_and_sed '#ssl_protocols =' \
-		 's/^#ssl_protocols.*/ssl_protocols = !SSLv2 !SSLv3/g' \
-		 /etc/dovecot/conf.d/10-ssl.conf || true
+# maknuti kludge kreiran u carnet-upgrade
+echo "CN: Prebacujem stare konfiguracije za dovecot 95-cn#-upgrade.conf u /var/backups..."
+test -f /etc/dovecot/conf.d/95-cn6-upgrade.conf && mv /etc/dovecot/conf.d/95-cn6-upgrade.conf /var/backups || true
+test -f /etc/dovecot/conf.d/95-cn7-upgrade.conf && mv /etc/dovecot/conf.d/95-cn7-upgrade.conf /var/backups || true
+test -f /etc/dovecot/conf.d/95-cn8-upgrade.conf && mv /etc/dovecot/conf.d/95-cn8-upgrade.conf /var/backups || true
+test -f /etc/dovecot/conf.d/95-cn9-upgrade.conf && mv /etc/dovecot/conf.d/95-cn9-upgrade.conf /var/backups || true
+
+# staro, može se brisati
+# dodao ico, gasi SSLv3 protokol
+#cp_check_and_sed '#ssl_protocols =' \
+#		 '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