X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=845fe4b5d263f7a1d30aff69f4c0409fe55bf3b7;hb=398d1393b4cd16ac3f5c5dd70295bbdbca78c18d;hp=cc6be230f4cd0586bf42a9192ffa482e88818123;hpb=fe42d8dc8a4a56cbd83360b8d8292816e7a30a8a;p=spamassassin-cn.git diff --git a/debian/postinst b/debian/postinst index cc6be23..845fe4b 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,37 +1,16 @@ #!/bin/sh -# postinst script for spamassassin-cn -# -# see: dh_installdeb(1) set -e -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package -# - -case "$1" in - configure|reconfigure) - # continue below - ;; - - *) - exit 0 - ;; -esac - -# import CN-functions +[ "$1" = "configure" ] || exit 0 +[ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx + +# Load CARNet Tools . /usr/share/carnet-tools/functions.sh -# load Debconf +# Load Debconf . /usr/share/debconf/confmodule + db_version 2.0 umask 022 @@ -59,12 +38,8 @@ db_stop || true 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 + service spamassassin stop + rstart=yes fi if ! getent group spamd >/dev/null 2>&1; then @@ -91,12 +66,8 @@ if [ "$run_as_user" = "non-root" ]; 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 + service spamassassin stop + restart=yes fi if [ -d "/var/run/spamd" ]; then @@ -386,6 +357,10 @@ fi sa-update --import /etc/spamassassin/sa-keys.pgp \ >>/var/log/sa-update.log 2>&1 || true +# import http://spamassassin.apache.org/updates/GPG.KEY +echo "CN: Importing new http://spamassassin.apache.org/updates/GPG.KEY..." +sa-update --import /usr/share/spamassassin-cn/GPG.KEY + # clean old RulesDuJour rules echo "CN: Cleaning old RulesDuJour and SARE rules..." rm -rf /etc/spamassassin/*_sare_*.cf /etc/spamassassin/RulesDuJour @@ -407,27 +382,13 @@ 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 + service spamassassin restart fi # restart the amavis -if [ "x$restart" = "xyes" -a -x /etc/init.d/amavisd-cn ]; then - if [ -x /usr/sbin/invoke-rc.d ]; then - invoke-rc.d --quiet amavisd-cn restart - else - /etc/init.d/amavisd-cn restart - fi -elif [ "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 +if [ "x$restart" = "xyes" -a -x /etc/init.d/amavis ]; then + service amavis restart fi # dh_installdeb will replace this with shell code automatically