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

diff --git a/debian/postinst b/debian/postinst
index a26e2a9..95c1ccb 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -96,11 +96,26 @@ if ! grep -q "^ssl_min_protocol = TLS" /etc/dovecot/conf.d/10-ssl.conf; 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
 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