X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=dovecot-cn.git;a=blobdiff_plain;f=debian%2Fpostinst;h=6ecc8f60a2b9f3ff9158d6e5fec2bf914e734e65;hp=994c0f5fd6db41c6c159d36df67aabd974fc1798;hb=a80671d5f813a53e6199cd63c7db8e89ba8c0d87;hpb=1ddfe2f6ea4e01167180ea020ae749e3ccbc8240

diff --git a/debian/postinst b/debian/postinst
index 994c0f5..6ecc8f6 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -6,65 +6,63 @@
 # Load CARNet Tools
 . /usr/share/carnet-tools/functions.sh
 
-
-cp_check_and_sed '^protocols' \
-                 's/protocols.*$/protocols = imap imaps pop3 pop3s/g' \
-		 /etc/dovecot/dovecot.conf || true
-
 cp_check_and_sed '#disable_plaintext_auth' \
                  's/#disable_plaintext_auth/disable_plaintext_auth/g' \
-		 /etc/dovecot/dovecot.conf || true
+		 /etc/dovecot/conf.d/10-auth.conf || true
 
 cp_check_and_sed 'disable_plaintext_auth.*yes' \
                  's/disable_plaintext_auth.*$/disable_plaintext_auth = no/g' \
-		 /etc/dovecot/dovecot.conf || true
+		 /etc/dovecot/conf.d/10-auth.conf || true
 
 cp_check_and_sed '#imap_client_workarounds' \
                  's/#imap_client_workarounds/imap_client_workarounds/g' \
-		 /etc/dovecot/dovecot.conf || true
+		 /etc/dovecot/conf.d/20-imap.conf || true
 
 cp_check_and_sed '#pop3_client_workarounds' \
                  's/#pop3_client_workarounds/pop3_client_workarounds/g' \
-		 /etc/dovecot/dovecot.conf || true
+		 /etc/dovecot/conf.d/20-pop3.conf || true
 
 cp_check_and_sed 'imap_client_workarounds' \
-                 's/imap_client_workarounds.*$/imap_client_workarounds = outlook-idle tb-extra-mailbox-sep netscape-eoh delay-newmail/g' \
-		 /etc/dovecot/dovecot.conf || true
+                 's/imap_client_workarounds.*$/imap_client_workarounds = delay-newmail tb-extra-mailbox-sep tb-lsub-flags/g' \
+		 /etc/dovecot/conf.d/20-imap.conf || true
 
 cp_check_and_sed 'pop3_client_workarounds' \
                  's/pop3_client_workarounds.*$/pop3_client_workarounds = outlook-no-nuls oe-ns-eoh/g' \
-		 /etc/dovecot/dovecot.conf || true
-
-cp_check_and_sed 'pop3_uidl_format' \
-                 's/pop3_uidl_format.*$/pop3_uidl_format = %v.%u/g' \
-		 /etc/dovecot/dovecot.conf || true
-
-cp_check_and_sed '#quota = maildir' \
-                 's/#quota = maildir/quota = fs/g' \
-		 /etc/dovecot/dovecot.conf || true
-
-# dodano zbog backward compatibility (etch->lenny)
-cp_check_and_sed '^mail_extra_groups' \
-                 's/^mail_extra_groups/mail_privileged_group/g' \
-		 /etc/dovecot/dovecot.conf || true
+		 /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' \
-		 /etc/dovecot/dovecot.conf || true
+		 /etc/dovecot/conf.d/10-ssl.conf || true
 
-# ovo je potrebno postaviti u verziji 1.2
-cp_check_and_sed '#mail_location' \
-                 's|#mail_location.*|mail_location=mbox:~/mail:INBOX=/var/mail/%u|g' \
-		 /etc/dovecot/dovecot.conf || true
+# trazio zelja
+cp_check_and_sed '#ssl =' \
+		 's/^#ssl =/ssl =/g' \
+		 /etc/dovecot/conf.d/10-ssl.conf || true
 
 # trazio zelja
-cp_check_and_sed '^ssl_disable' \
-                 's/^ssl_disable = yes/#ssl_disable = yes/g' \
-		 /etc/dovecot/dovecot.conf || true
+cp_check_and_sed 'ssl = no' \
+		 's/^ssl = no/ssl = yes/g' \
+		 /etc/dovecot/conf.d/10-ssl.conf || true
+
+if ! grep -q ^ssl_cert /etc/dovecot/conf.d/10-ssl.conf \
+  && ! grep -q ^ssl_key /etc/dovecot/conf.d/10-ssl.conf; then
+  cp_check_and_sed '#ssl_cert = </etc/dovecot/dovecot.pem' \
+		   's|#ssl_cert = </etc/dovecot/dovecot.pem|ssl_cert = </etc/dovecot/dovecot.pem|g' \
+		   /etc/dovecot/conf.d/10-ssl.conf || true
+  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
+
+  echo "CN: Generating certificate and key..."
+  /usr/share/dovecot-cn/mkcert.sh > /dev/null
+fi
+
+
 
-cp_check_and_sed '#ssl = yes' \
-                 's/^#ssl = yes/ssl = yes/g' \
-		 /etc/dovecot/dovecot.conf || true
+# 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
 
 # restart 
 if [ -x /usr/sbin/invoke-rc.d ]; then
@@ -72,3 +70,7 @@ if [ -x /usr/sbin/invoke-rc.d ]; then
 else
   [ -x /etc/init.d/dovecot ] && /etc/init.d/dovecot restart
 fi
+
+#DEBHELPER#
+
+exit 0