X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=cde2e48e7ca22669de593367ebee07d946a952e0;hb=1185b2ef230939782be3a96949ad7d7dfa738686;hp=8b4eb47ebac3566c16a6480ac86c7965ccd780b6;hpb=a9ff5d97ac0cfb5196da34f0275348c977326158;p=postfix-cn.git diff --git a/debian/postinst b/debian/postinst index 8b4eb47..cde2e48 100755 --- a/debian/postinst +++ b/debian/postinst @@ -7,6 +7,7 @@ set -e # Load CARNet Tools . /usr/share/carnet-tools/functions.sh + # Load Debconf . /usr/share/debconf/confmodule @@ -31,6 +32,15 @@ if echo $rbl | grep -q opm.blitzed.org; then db_set postfix-cn/rbl "$rbl" || true fi +# Wed, 12 Jun 2013 15:15:28 +0200 +# dnsbl.njabl.org je ugasen 2013-03 +if echo $rbl | grep -q dnsbl.njabl.org; then + rbl="`echo $rbl | sed 's/dnsbl.njabl.org, //g'`" + # za svaki slucaj, ako je na kraju + rbl="`echo $rbl | sed 's/dnsbl.njabl.org//g'`" + db_set postfix-cn/rbl "$rbl" || true +fi + db_get postfix-cn/matchgecos || true matchgecos="$RET" @@ -49,15 +59,41 @@ netaddr="$RET" cp -pf /etc/postfix/master.cf /etc/postfix/master.cf.dpkg-tmp.$$ cp -pf /etc/postfix/main.cf /etc/postfix/main.cf.dpkg-tmp.$$ -# srediti master.cf za TLS +# srediti master.cf za TLS & submission & retry if [ -f /etc/postfix/master.cf ]; then cp_check_and_sed '^#tlsmgr' \ 's/^#tlsmgr/tlsmgr/g' \ /etc/postfix/master.cf || true + cp_check_and_sed '^#submission' \ + 's/^#submission/submission/g' \ + /etc/postfix/master.cf || true + + cp_check_and_sed '^#retry' \ + 's/^#retry/retry/g' \ + /etc/postfix/master.cf || true + cp_check_and_sed '^#smtps' \ 's/^#smtps/smtps/g' \ /etc/postfix/master.cf || true + + cp_check_and_sed '^# -o' \ + 's/^# -o/ -o/g' \ + /etc/postfix/master.cf || true + + for option in "-o milter_macro_daemon_name=ORIGINATING" \ + "-o smtpd_recipient_restrictions=" \ + "-o smtpd_reject_unlisted_recipient=no" \ + "-o smtpd_relay_restrictions=permit_sasl_authenticated,reject" \ + "-o smtpd_sasl_auth_enable=yes" \ + "-o smtpd_tls_security_level=encrypt" \ + "-o smtpd_tls_wrappermode=yes" \ + "-o syslog_name=postfix/smtps" \ + "-o syslog_name=postfix/submission"; do + cp_check_and_sed "^# $option" \ + "s/# $option/$option/g" \ + /etc/postfix/master.cf || true + done fi # ovo manje/vise uzima kao default, ali u slucaju da je multihomed stroj, @@ -70,9 +106,10 @@ postconf -e myorigin="$mailname" postconf -e append_dot_mydomain="yes" postconf -e append_at_myorigin="yes" -# dodaj 127.0.0.0/8 i netaddr +# dodaj 127.0.0.0/8, netaddr i ipv6-localhost +# dodaje izlazne servere za webmail --zelja mynetworks="`postconf -h mynetworks`" -for i in "127.0.0.0/8" "$netaddr"; do +for i in "127.0.0.0/8" "\[::1\]/128" "$netaddr" "193.198.233.95" "193.198.233.96"; do if ! echo $mynetworks | grep -q $i; then mynetworks="$mynetworks, $i" fi @@ -240,65 +277,38 @@ fi # restart saslauthd if [ "$restart_saslauthd" = "yes" ]; then - if [ -x /usr/sbin/invoke-rc.d ]; then - [ -x /etc/init.d/saslauthd ] && invoke-rc.d saslauthd restart - else - [ -x /etc/init.d/saslauthd ] && /etc/init.d/saslauthd restart - fi -fi - -# izgenerirati certifikate -cert="postfix" # basename of certificate -description="Postfix SMTP daemon" # descriptive text -cd /etc/ssl/certs -PATH=$PATH:/usr/bin/ssl -if [ -f "$cert.pem" ]; then - echo "CN: You already have /etc/ssl/certs/$cert.pem" -else - echo "CN: Creating generic self-signed certificate: /etc/ssl/certs/$cert.pem" - echo "CN: (replace with hand-crafted or authorized one if needed)." - HOSTNAME=`hostname -s` - FQDN=`hostname -f` - openssl req -new -x509 -days 365 -nodes -out "$cert.pem" -keyout "$cert.pem" > /dev/null 2>&1 <<+ -. -. -. -$description -$hostname -$fqdn -root@$mailname -+ - ln -sf "$cert.pem" `openssl x509 -noout -hash < "$cert.pem"`.0 - chown root:root "/etc/ssl/certs/$cert.pem" - chmod 0640 "/etc/ssl/certs/$cert.pem" + service saslauthd restart fi # TLS stuff -postconf -e smtp_use_tls="yes" -postconf -e smtp_tls_session_cache_database="sdbm:/var/lib/postfix/smtp_scache" +postconf -e smtp_tls_security_level="may" +postconf -e smtp_tls_session_cache_database="btree:/var/lib/postfix/smtp_scache" postconf -e smtp_tls_session_cache_timeout="3600s" -postconf -e smtpd_use_tls="yes" -postconf -e smtpd_tls_session_cache_database="sdbm:/var/lib/postfix/smtpd_scache" +postconf -e smtpd_tls_security_level="may" +postconf -e smtpd_tls_session_cache_database="btree:/var/lib/postfix/smtpd_scache" postconf -e smtpd_tls_session_cache_timeout="3600s" postconf -e tls_random_source="dev:/dev/urandom" postconf -e smtpd_tls_exclude_ciphers="aNULL" postconf -e smtpd_tls_mandatory_exclude_ciphers="aNULL" -# ako je postavljen neki drugi certifikat, ne diraj -smtp_tls_cert_file="`postconf -h smtp_tls_cert_file`" -if [ -z "$smtp_tls_cert_file" ]; then - postconf -e smtp_tls_cert_file="/etc/ssl/certs/$cert.pem" + +# nije potrebno generiranje certifikata jer postfix koristi paket ssl-cert +# ako je postavljen snakeoil certifikat za smtpd_tls_* postavi isti za smtp_tls_* +smtpd_tls_cert_file="`postconf -h smtpd_tls_cert_file`" +if [ "$smtpd_tls_cert_file" = "/etc/ssl/certs/ssl-cert-snakeoil.pem" ]; then + postconf -e smtp_tls_cert_file="/etc/ssl/certs/ssl-cert-snakeoil.pem" + postconf -e smtp_tls_key_file="/etc/ssl/private/ssl-cert-snakeoil.key" fi + +# ako je prazan, postavi na defaultni iz paketa ssl-cert smtpd_tls_cert_file="`postconf -h smtpd_tls_cert_file`" if [ -z "$smtpd_tls_cert_file" ]; then - postconf -e smtpd_tls_cert_file="/etc/ssl/certs/$cert.pem" + postconf -e smtpd_tls_cert_file="/etc/ssl/certs/ssl-cert-snakeoil.pem" + postconf -e smtpd_tls_key_file="/etc/ssl/private/ssl-cert-snakeoil.key" fi -smtp_tls_key_file="`postconf -h smtp_tls_key_file`" -if [ -z "$smtp_tls_key_file" ]; then - postconf -e smtp_tls_key_file="\$smtp_tls_cert_file" -fi -smtpd_tls_key_file="`postconf -h smtpd_tls_key_file`" -if [ -z "$smtpd_tls_key_file" ]; then - postconf -e smtpd_tls_key_file="\$smtpd_tls_cert_file" +smtp_tls_cert_file="`postconf -h smtp_tls_cert_file`" +if [ -z "$smtp_tls_cert_file" ]; then + postconf -e smtp_tls_cert_file="/etc/ssl/certs/ssl-cert-snakeoil.pem" + postconf -e smtp_tls_key_file="/etc/ssl/private/ssl-cert-snakeoil.key" fi # prije bilo u /etc/postfix/, od verzije 2.1.5-2 je u /var/spool/postfix @@ -359,11 +369,11 @@ if ! cmp -s /etc/postfix/main.cf /etc/postfix/main.cf.dpkg-tmp.$$; then fi rm -f /etc/postfix/main.cf.dpkg-tmp.$$ -if ! grep -q "retry unix - - - - - error" /etc/postfix/master.cf; then - echo "CN: Please, add this line in /etc/postfix/master.cf and restart Postfix." - echo "retry unix - - - - - error" - echo -fi +#if ! grep -q "retry unix - - y - - error" /etc/postfix/master.cf; then +# echo "CN: Please, add this line in /etc/postfix/master.cf and restart Postfix." +# echo "retry unix - - y - - error" +# echo +#fi # kreiraj aliases_gecos if [ -x /usr/share/postfix-cn/make-aliases-gecos.sh ]; then @@ -373,12 +383,13 @@ if [ -x /usr/share/postfix-cn/make-aliases-gecos.sh ]; then fi fi +# rjesava gresku using backwards-compatible default setting chroot=y +postconf -F smtp/inet/chroot=y && restart_postfix="yes" + # restart if [ "$restart_postfix" = "yes" ]; then - if [ -x /usr/sbin/invoke-rc.d ]; then - [ -x /etc/init.d/postfix ] && invoke-rc.d postfix restart - else - [ -x /etc/init.d/postfix ] && /etc/init.d/postfix restart - fi + service postfix restart fi cp_mail postfix-cn + +#DEBHELPER#