X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=a26e2a97d1c20b6edb41685121f6947c4ce07ee6;hb=c2b23b8f4c0b35952a973f234744890bf8ab3c24;hp=ad23302dea3eca8fdef943a5dbfa0ada07c421db;hpb=6dc17094b6fc20a9b486d97ab393523c76a79f69;p=dovecot-cn.git diff --git a/debian/postinst b/debian/postinst index ad23302..a26e2a9 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,4 +1,6 @@ -#!/bin/sh -e +#!/bin/sh + +set -e [ "$1" = "configure" ] || exit 0 [ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx @@ -31,7 +33,12 @@ cp_check_and_sed 'pop3_client_workarounds' \ /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' \ + 's/#ssl_cipher_list.*/ssl_cipher_list = ALL:!aNULL:!eNULL:!ADH!LOW:!MEDIUM:!EXP:HIGH/g' \ + /etc/dovecot/conf.d/10-ssl.conf || true + +# izbacujemo SSLv2 +cp_check_and_sed 'ssl_cipher_list' \ + 's/:\!SSLv2//g' \ /etc/dovecot/conf.d/10-ssl.conf || true # trazio zelja @@ -44,18 +51,81 @@ cp_check_and_sed 'ssl = no' \ 's/^ssl = no/ssl = yes/g' \ /etc/dovecot/conf.d/10-ssl.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 +if ! grep -q ^ssl_cert /etc/dovecot/conf.d/10-ssl.conf \ + && ! grep -q ^ssl_key /etc/dovecot/conf.d/10-ssl.conf; then -# restart -if [ -x /usr/sbin/invoke-rc.d ]; then - [ -x /etc/init.d/dovecot ] && invoke-rc.d dovecot restart -else - [ -x /etc/init.d/dovecot ] && /etc/init.d/dovecot restart + if [ ! -f /etc/dovecot/dovecot.pem -a ! -f /etc/dovecot/private/dovecot.pem ]; then + echo "CN: Generating certificate and key..." + /usr/share/dovecot-cn/mkcert.sh || true + fi + + cp_check_and_sed '#ssl_cert =