r11: Preliminary etch package.

[amavisd-cn.git] / src / variables.sh

diff --git a/src/variables.sh b/src/variables.sh
index 6652536..f90ac03 100644 (file)
--- a/src/variables.sh
+++ b/src/variables.sh
@@ -1,18 +1,9 @@
 PKG=amavisd-cn
 AHOME=/var/lib/amavis
-MAILDIR=/etc/mail
 ALIASES=/etc/aliases
-sendmail_cf=$MAILDIR/sendmail.cf
-sendmail_mc=$MAILDIR/sendmail.mc
-submit_mc=$MAILDIR/submit.mc
-ct_file=$MAILDIR/trusted-users
 CRONTAB=/etc/cron.d/$PKG
-ACONFOLD=/etc/amavisd.conf
-ACONFMOVED=/etc/amavisd.conf.cn-old
-ACONF=/etc/amavis/amavisd.conf
-POSTTMPL=/usr/share/$PKG/amavisd.conf.postfix-template
-SENDTMPL=/usr/share/$PKG/amavisd.conf.sendmail-template
-postdiff=/usr/share/$PKG/sendmail-to-postfix.diff
+ACONF=/etc/amavis/conf.d/40-carnet
+ACONFTMPL=/usr/share/$PKG/templates/40-carnet
 BLIST=$AHOME/blacklist_sender
 WLIST=$AHOME/whitelist_sender
 # domain is set in postinst
@@ -23,6 +14,5 @@ host=$(/bin/hostname -f)
 options='
 clamd  clamav-daemon           clamav  /usr/sbin/clamd         clamav/clamd.pid                5       clamav.log
 amavis amavis.amavisd-new      amavis  amavisd \\(master\\)    amavis/amavisd.pid              5       socket
-milter amavisd-new-milter      amavis  /usr/sbin/amavis-milter amavis/amavisd-new-milter.pid   5       socket
 '
 # note: pgrep -f takes a regexp, and this is shell expanded once, hence \\