From: Ivan Rako <irako@nekkar.carnet.hr>
Date: Wed, 21 Mar 2012 14:16:00 +0000 (+0100)
Subject: izmjene oko ssl_disable
X-Git-Tag: debian/1%1.2.15.3^0
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=refs%2Fheads%2Fsqueeze;p=dovecot-cn.git

izmjene oko ssl_disable
---

diff --git a/debian/postinst b/debian/postinst
index 0f6fe4f..f13fe76 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -58,14 +58,25 @@ cp_check_and_sed '#mail_location' \
 		 /etc/dovecot/dovecot.conf || true
 
 # trazio zelja
-cp_check_and_sed '^ssl_disable' \
-                 's/^ssl_disable = yes/#ssl_disable = yes/g' \
+cp_check_and_sed '#ssl =' \
+		 's/^#ssl =/ssl =/g' \
 		 /etc/dovecot/dovecot.conf || true
 
-cp_check_and_sed '#ssl = yes' \
-                 's/^#ssl = yes/ssl = yes/g' \
+if grep -q "^ssl_disable .*no" /etc/dovecot/dovecot.conf; then
+  cp_check_and_sed '^ssl =' \
+                   's/^ssl =.*/ssl = yes/g' \
+		   /etc/dovecot/dovecot.conf || true
+elif grep -q "^ssl_disable .*yes" /etc/dovecot/dovecot.conf; then
+  cp_check_and_sed '^ssl =' \
+                   's/^ssl =.*/ssl = no/g' \
+		   /etc/dovecot/dovecot.conf || true
+fi
+
+cp_check_and_sed '^ssl_disable' \
+                 's/^ssl_disable/#ssl_disable/g' \
 		 /etc/dovecot/dovecot.conf || true
 
+
 # restart 
 if [ -x /usr/sbin/invoke-rc.d ]; then
   [ -x /etc/init.d/dovecot ] && invoke-rc.d dovecot restart