X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Fvariables.sh;h=21496417c0a06aaa790296990a5b6d848b1eeb6d;hb=15d1b0baa8fb2c1b0ff425952949012e773c5445;hp=6652536928f0756d453bc75ea734e6f36436f159;hpb=1c3f285a0edf2971bb7fd75147e10bb66fb5323c;p=amavisd-cn.git

diff --git a/src/variables.sh b/src/variables.sh
index 6652536..2149641 100644
--- a/src/variables.sh
+++ b/src/variables.sh
@@ -1,18 +1,10 @@
 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
+MASTTMPL=/usr/share/$PKG/templates/master.cf
 BLIST=$AHOME/blacklist_sender
 WLIST=$AHOME/whitelist_sender
 # domain is set in postinst
@@ -23,6 +15,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 \\