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

diff --git a/debian/postinst b/debian/postinst
index 5b18253..95c1ccb 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -65,33 +65,78 @@ 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
+  # 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
+
+### buster ima DH ključ koji se nalazi u paketu dovecot-core
+# ne radimo ništa ako već postoji ^ssl_dh koji nije prazan
+
+if ! grep -q "^ssl_dh = /" /etc/dovecot/conf.d/10-ssl.conf; then
+	# postavlja DH i uključuje varijablu
+	cp_check_and_sed '#ssl_dh =' \
+			 's,^#ssl_dh.*,ssl_dh = </usr/share/dovecot/dh.pem,g' \
+			 /etc/dovecot/conf.d/10-ssl.conf || true
+fi
+
+# maknuti kludge kreiran u carnet-upgrade
+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
+# nije više potrebno editirati dovecot.conf koji je samo hrpa includea
+test -f /etc/dovecot/dovecot.conf.cn6-upgrade && mv /etc/dovecot/dovecot.conf.cn6-upgrade /var/backups || true
+test -f /etc/dovecot/dovecot.conf.cn7-upgrade && mv /etc/dovecot/dovecot.conf.cn7-upgrade /var/backups || true
+test -f /etc/dovecot/dovecot.conf.cn8-upgrade && mv /etc/dovecot/dovecot.conf.cn8-upgrade /var/backups || true
+test -f /etc/dovecot/dovecot.conf.cn9-upgrade && mv /etc/dovecot/dovecot.conf.cn9-upgrade /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
+#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
+#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
+#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