projects
/
spamassassin-cn.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
izmjene za systemd
[spamassassin-cn.git]
/
debian
/
postinst
diff --git
a/debian/postinst
b/debian/postinst
index
ff854eb
..
83bd72f
100755
(executable)
--- a/
debian/postinst
+++ b/
debian/postinst
@@
-59,12
+59,8
@@
db_stop || true
if [ "$run_as_user" = "non-root" ]; then
if ! grep -q '^OPTIONS=".*username=spamd"' \
/etc/default/spamassassin; then
if [ "$run_as_user" = "non-root" ]; then
if ! grep -q '^OPTIONS=".*username=spamd"' \
/etc/default/spamassassin; then
- if [ -x /usr/sbin/invoke-rc.d ]; then
- invoke-rc.d --quiet spamassassin stop
- else
- /etc/init.d/spamassassin stop
- fi
- rstart=yes
+ systemctl stop spamassassin
+ rstart=yes
fi
if ! getent group spamd >/dev/null 2>&1; then
fi
if ! getent group spamd >/dev/null 2>&1; then
@@
-91,12
+87,8
@@
if [ "$run_as_user" = "non-root" ]; then
elif [ "$run_as_user" = "root" ]; then
if grep -q '^OPTIONS=".*username=spamd"' \
/etc/default/spamassassin; then
elif [ "$run_as_user" = "root" ]; then
if grep -q '^OPTIONS=".*username=spamd"' \
/etc/default/spamassassin; then
- if [ -x /usr/sbin/invoke-rc.d ]; then
- invoke-rc.d --quiet spamassassin stop
- else
- /etc/init.d/spamassassin stop
- fi
- restart=yes
+ systemctl stop spamassassin
+ restart=yes
fi
if [ -d "/var/run/spamd" ]; then
fi
if [ -d "/var/run/spamd" ]; then
@@
-238,6
+230,13
@@
if [ -f $examdir/local.cf ]; then
$confdir/local.cf.$$ || true
echo "CN: Activated $trusted_networks as trusted networks"
$confdir/local.cf.$$ || true
echo "CN: Activated $trusted_networks as trusted networks"
+ if dpkg --compare-versions "$2" lt "2:3.3.5"; then
+ cp_check_and_sed "^bayes_auto_expire 1" \
+ "s#^bayes_auto_expire .*#bayes_auto_expire 0#g" \
+ $confdir/local.cf.$$ || true
+ echo "CN: Set bayes_auto_expire to 0"
+ fi
+
# different than template
if ! cmp -s $confdir/local.cf.$$ $confdir/local.cf; then
# backup if not zero size
# different than template
if ! cmp -s $confdir/local.cf.$$ $confdir/local.cf; then
# backup if not zero size
@@
-287,6
+286,16
@@
for i in $list; do
mv -f $i.$$ $i
fi
rm -f $i.$$
mv -f $i.$$ $i
fi
rm -f $i.$$
+
+ # enable AWL
+ cp -f $i $i.$$
+ plugin="loadplugin Mail::SpamAssassin::Plugin::AWL"
+ cp_check_and_sed "^#$plugin.*$" \
+ "s/^#$plugin.*$/$plugin/g" $i.$$ || true
+ if ! cmp -s $i.$$ $i; then
+ mv -f $i.$$ $i
+ fi
+ rm -f $i.$$
done
# check and replace /etc/default/spamasassin if needed
done
# check and replace /etc/default/spamasassin if needed
@@
-357,7
+366,7
@@
if getent passwd amavis >/dev/null 2>&1; then
fi
# import SA keys
fi
# import SA keys
-echo "CN: Importing SpamAssassin and SARE public PGP keys"
+echo "CN: Importing SpamAssassin channels' public PGP keys"
echo "$(date +'%d-%m-%Y %T'): Importing new SA keys..." >> \
/var/log/sa-update.log
if [ ! -d /etc/spamassassin/sa-update-keys ]; then
echo "$(date +'%d-%m-%Y %T'): Importing new SA keys..." >> \
/var/log/sa-update.log
if [ ! -d /etc/spamassassin/sa-update-keys ]; then
@@
-372,6
+381,8
@@
sa-update --import /etc/spamassassin/sa-keys.pgp \
# clean old RulesDuJour rules
echo "CN: Cleaning old RulesDuJour and SARE rules..."
rm -rf /etc/spamassassin/*_sare_*.cf /etc/spamassassin/RulesDuJour
# clean old RulesDuJour rules
echo "CN: Cleaning old RulesDuJour and SARE rules..."
rm -rf /etc/spamassassin/*_sare_*.cf /etc/spamassassin/RulesDuJour
+find /var/lib/spamassassin -iname \*_sare_\* -print0| xargs -0r rm -rf
+sed -i -e '/dostech.net/d' /etc/spamassassin/sa-update.channels
echo "CN: Please use /etc/spamassassin/sa-update.channels in future!"
# get/update the rules
echo "CN: Please use /etc/spamassassin/sa-update.channels in future!"
# get/update the rules
@@
-380,28
+391,21
@@
echo "$(date +'%d-%m-%Y %T'): Fetching new SA rules..." >> \
/var/log/sa-update.log
sa-update \
--channelfile /etc/spamassassin/sa-update.channels \
/var/log/sa-update.log
sa-update \
--channelfile /etc/spamassassin/sa-update.channels \
- --gpgkey 856AA88A \
+ --allowplugins \
+ --gpgkey 6C6191E3 \
--gpgkey 24F434CE \
--gpgkey 24F434CE \
- --gpgkey BDE9DC10 >>/var/log/sa-update.log 2>&1 || true
+ --gpgkey BDE9DC10 >>/var/log/sa-update.log 2>&1 &
echo "CN: SpamAssassin updates are now logged at /var/log/sa-update.log"
# restart the spamasassin
if [ "x$restart" = "xyes" ]; then
echo "CN: SpamAssassin updates are now logged at /var/log/sa-update.log"
# restart the spamasassin
if [ "x$restart" = "xyes" ]; then
- if [ -x /usr/sbin/invoke-rc.d ]; then
- pkill -f /usr/sbin/spamd || true
- invoke-rc.d --quiet spamassassin restart
- else
- /etc/init.d/spamassassin restart
- fi
+ pkill -f /usr/sbin/spamd || true
+ systemctl restart spamassassin
fi
# restart the amavis
if [ "x$restart" = "xyes" -a -x /etc/init.d/amavis ]; then
fi
# restart the amavis
if [ "x$restart" = "xyes" -a -x /etc/init.d/amavis ]; then
- if [ -x /usr/sbin/invoke-rc.d ]; then
- invoke-rc.d --quiet amavis restart
- else
- /etc/init.d/amavis restart
- fi
+ systemctl restart amavis
fi
# dh_installdeb will replace this with shell code automatically
fi
# dh_installdeb will replace this with shell code automatically