X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=33c727b06652418ef638a191212bd07664390fb5;hb=60170218bbb138f97696ac51b4ee41460b9a51f8;hp=fe02c1534dc50fd1de4e7d23f29619325743eb2d;hpb=c18ccf295b02b5ab918b983f2e651de97e58c7ba;p=postfix-cn.git diff --git a/debian/postinst b/debian/postinst index fe02c15..33c727b 100755 --- a/debian/postinst +++ b/debian/postinst @@ -5,8 +5,9 @@ set -e [ "$1" = "configure" ] || exit 0 [ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx -# Load CARNet Tools +# Load CARNET Tools . /usr/share/carnet-tools/functions.sh + # Load Debconf . /usr/share/debconf/confmodule @@ -40,7 +41,15 @@ if echo $rbl | grep -q dnsbl.njabl.org; then db_set postfix-cn/rbl "$rbl" || true fi -db_get postfix-cn/matchgecos || true +# zelja, 2021-04-29 +# ako je spamhaus.org ovdje, postavi eta.cert.hr, a sam +# spamhaus je nepotreban, jer imamo zen.dnsbl-sh.carnet.hr +if echo $rbl | grep -q zen.spamhaus.org; then + rbl="`echo $rbl | sed 's/zen.spamhaus.org, /eta.cert.hr, /g'`" + # za svaki slucaj, ako je na kraju + rbl="`echo $rbl | sed 's/zen.spamhaus.org/eta.cert.hr/g'`" + db_set postfix-cn/rbl "$rbl" || true +fi db_get postfix-cn/matchgecos || true matchgecos="$RET" @@ -60,15 +69,49 @@ 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 + + for option in "o smtpd_client_restrictions=" \ + "o smtpd_helo_restrictions=" \ + "o smtpd_sender_restrictions="; 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, @@ -81,9 +124,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 @@ -173,7 +217,11 @@ smtpd_recipient_restrictions="reject_invalid_hostname, \ reject_unauth_pipelining, \ permit_sasl_authenticated, \ permit_mynetworks, \ - reject_unauth_destination" + reject_unauth_destination, \ + check_client_access hash:/etc/postfix/cn-client-access, \ + check_helo_access hash:/etc/postfix/cn-helo-access, \ + check_sender_access hash:/etc/postfix/cn-sender-access, \ + check_recipient_access hash:/etc/postfix/cn-recipient-access" # dodaj samo rbl-ove iz debconfa if [ "$rbl" ]; then @@ -186,6 +234,14 @@ fi smtpd_recipient_restrictions="$smtpd_recipient_restrictions, permit" postconf -e smtpd_recipient_restrictions="$smtpd_recipient_restrictions" +# Header & body checks + +postconf -e header_checks="pcre:/etc/postfix/cn-header-checks" +postconf -e mime_header_checks="pcre:/etc/postfix/cn-mime-header-checks" +postconf -e nested_header_checks="pcre:/etc/postfix/cn-nested-header-checks" +postconf -e body_checks="pcre:/etc/postfix/cn-body-checks" + + # SASL stuff postconf -e smtpd_sasl_auth_enable="yes" postconf -e smtpd_sasl_security_options="noanonymous" @@ -251,19 +307,15 @@ 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 + service saslauthd restart fi # TLS stuff postconf -e smtp_tls_security_level="may" -postconf -e smtp_tls_session_cache_database="sdbm:/var/lib/postfix/smtp_scache" +postconf -e smtp_tls_session_cache_database="btree:/var/lib/postfix/smtp_scache" postconf -e smtp_tls_session_cache_timeout="3600s" postconf -e smtpd_tls_security_level="may" -postconf -e smtpd_tls_session_cache_database="sdbm:/var/lib/postfix/smtpd_scache" +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" @@ -347,27 +399,47 @@ 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 +if [ -x /usr/sbin/newaliases-gecos ]; then if [ "$matchgecos" = "true" ]; then echo "CN: Creating GECOS alias map..." - /usr/share/postfix-cn/make-aliases-gecos.sh + /usr/sbin/newaliases-gecos fi fi +# rjesava gresku using backwards-compatible default setting chroot=y + +for service in smtps/inet smtp/inet smtp/unix submission/inet pickup/fifo cleanup/unix qmgr/fifo rewrite/unix bounce/unix defer/unix trace/unix verify/unix flush/unix relay/unix showq/unix error/unix scache/unix discard/unix retry/unix +do + postconf -F $service/chroot=y +done +restart_postfix="yes" + + +# obavijest za webmail + +cp-update -t postfix-cn /etc/postfix/main.cf <