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

diff --git a/debian/postinst b/debian/postinst
index 18fd1cf..95c1ccb 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -74,7 +74,7 @@ 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"; then
+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' \
@@ -96,12 +96,26 @@ if ! grep -q "^ssl_min_protocol = TLS"; then
 			 /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
-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
+# 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