projects
/
postfix-cn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rijesena poruka 'compatibility mode' za sve servise, newaliases-gecos, dodan eta...
[postfix-cn.git]
/
debian
/
postinst
diff --git
a/debian/postinst
b/debian/postinst
index
c642710
..
818ecff
100755
(executable)
--- a/
debian/postinst
+++ b/
debian/postinst
@@
-5,8
+5,9
@@
set -e
[ "$1" = "configure" ] || exit 0
[ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
[ "$1" = "configure" ] || exit 0
[ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
-# Load CARNet Tools
+# Load CARNET Tools
. /usr/share/carnet-tools/functions.sh
. /usr/share/carnet-tools/functions.sh
+
# Load Debconf
. /usr/share/debconf/confmodule
# Load Debconf
. /usr/share/debconf/confmodule
@@
-93,6
+94,14
@@
if [ -f /etc/postfix/master.cf ]; then
"s/# $option/$option/g" \
/etc/postfix/master.cf || true
done
"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,
fi
# ovo manje/vise uzima kao default, ali u slucaju da je multihomed stroj,
@@
-106,10
+115,11
@@
postconf -e append_dot_mydomain="yes"
postconf -e append_at_myorigin="yes"
# dodaj 127.0.0.0/8, netaddr i ipv6-localhost
postconf -e append_at_myorigin="yes"
# dodaj 127.0.0.0/8, netaddr i ipv6-localhost
+# dodaje izlazne servere za webmail --zelja
mynetworks="`postconf -h mynetworks`"
mynetworks="`postconf -h mynetworks`"
-for i in "127.0.0.0/8" "$netaddr" "[::1]/128"; 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
if ! echo $mynetworks | grep -q $i; then
- mynetworks="$mynetworks $i"
+ mynetworks="$mynetworks, $i"
fi
done
postconf -e mynetworks="$mynetworks"
fi
done
postconf -e mynetworks="$mynetworks"
@@
-280,10
+290,10
@@
fi
# TLS stuff
postconf -e smtp_tls_security_level="may"
# 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 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"
postconf -e smtpd_tls_session_cache_timeout="3600s"
postconf -e tls_random_source="dev:/dev/urandom"
postconf -e smtpd_tls_exclude_ciphers="aNULL"
@@
-374,13
+384,21
@@
rm -f /etc/postfix/main.cf.dpkg-tmp.$$
#fi
# kreiraj aliases_gecos
#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..."
if [ "$matchgecos" = "true" ]; then
echo "CN: Creating GECOS alias map..."
- /usr/share/postfix-cn/make-aliases-gecos.sh
+ /usr/sbin/newaliases-gecos
fi
fi
fi
fi
+# rjesava gresku using backwards-compatible default setting chroot=y
+
+for service in 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"
+
# restart
if [ "$restart_postfix" = "yes" ]; then
service postfix restart
# restart
if [ "$restart_postfix" = "yes" ]; then
service postfix restart