# obrisati $mydomain, ako je upgrade sa starije verzije
# te srediti mydestination
-if dpkg --compare-versions "$2" lt 2.1.5-8; then
+if dpkg --compare-versions "$2" lt 2.3.8-2; then
mydestination="`postconf -h mydestination`"
if echo $mydestination | grep -q ", \$mydomain"; then
mydestination="`echo $mydestination | sed 's/, \$mydomain//g'`"
fi
+ if ! echo $mydestination | grep -q "localhost.\$mydomain"; then
+ mydestination="$mydestination, localhost.\$mydomain"
+ fi
+ if ! echo $mydestination | grep -q "\$myhostname"; then
+ mydestination="\$myhostname, $mydestination"
+ fi
postconf -e mydestination="$mydestination"
fi
fi
fi
-if dpkg --compare-versions "$2" lt 2.1.5-6 && \
- [ -f /etc/postgrey/whitelist_clients ]; then
- # dodaj CARNet MX u /etc/postgrey/whitelist_clients
- cp-update postfix-cn /etc/postgrey/whitelist_clients < /usr/share/postfix-cn/carnet_whitelist_clients
- restart_postgrey="yes"
-fi
-
-if [ -f /etc/default/postgrey ]; then
- if ! grep -q "^POSTGREY_OPTS=.*--delay" /etc/default/postgrey; then
- cp_check_and_sed 'POSTGREY_OPTS=' \
- 's/^POSTGREY_OPTS="/POSTGREY_OPTS="--delay=58 /g' \
- /etc/default/postgrey || true
- restart_postgrey="yes"
- fi
-fi
-
-if [ "$restart_postgrey" = "yes" ]; then
- if [ -x /usr/sbin/invoke-rc.d ]; then
- [ -x /etc/init.d/postgrey ] && invoke-rc.d postgrey restart
- else
- [ -x /etc/init.d/postgrey ] && /etc/init.d/postgrey restart
- fi
-fi
-
# restart
if [ "$restart_postfix" = "yes" ]; then
if [ -x /usr/sbin/invoke-rc.d ]; then