diff --git a/bms.py b/bms.py index 63c5f44e50d9a631faefcce8db92afed2950d5f6..2a6e4ede2f44ed489f89fd80d2a5de2f083b3208 100644 --- a/bms.py +++ b/bms.py @@ -1,6 +1,9 @@ #!/usr/bin/env python # A simple milter that has grown quite a bit. # $Log$ +# Revision 1.112 2007/09/13 14:51:03 customdesigned +# Report domain on reputation reject. +# # Revision 1.111 2007/07/25 17:14:59 customdesigned # Move milter apps to /usr/lib/pymilter # @@ -280,6 +283,7 @@ milter_log = logging.getLogger('milter') def read_config(list): cp = MilterConfigParser({ 'tempdir': "/var/log/milter/save", + 'datadir': "/var/log/milter", 'socket': "/var/run/milter/pythonsock", 'timeout': '600', 'scan_html': 'no', @@ -299,6 +303,7 @@ def read_config(list): }) cp.read(list) if cp.has_option('milter','datadir'): + print "chdir:",cp.get('milter','datadir') os.chdir(cp.get('milter','datadir')) # milter section @@ -537,11 +542,8 @@ class SPFPolicy(object): from Milter.cache import AddrCache cbv_cache = AddrCache(renew=7) -cbv_cache.load('send_dsn.log',age=30) auto_whitelist = AddrCache(renew=30) -auto_whitelist.load('auto_whitelist.log',age=120) blacklist = AddrCache(renew=30) -blacklist.load('blacklist.log',age=60) class bmsMilter(Milter.Milter): """Milter to replace attachments poisonous to Windows with a WARNING message, @@ -1828,6 +1830,10 @@ def main(): if __name__ == "__main__": read_config(["/etc/mail/pymilter.cfg","milter.cfg"]) + + cbv_cache.load('send_dsn.log',age=30) + auto_whitelist.load('auto_whitelist.log',age=120) + blacklist.load('blacklist.log',age=60) if dspam_dict: import dspam # low level spam check diff --git a/milter.rc7 b/milter.rc7 index 3c5aec1850d605b1bf40feb9757ad04d18051516..8fdebe72a4fe870e2aca5fa8f9e47297fc2dcc76 100755 --- a/milter.rc7 +++ b/milter.rc7 @@ -23,7 +23,7 @@ pidof() { # Source function library. . /etc/rc.d/init.d/functions -[ -x /var/log/milter/start.sh ] || exit 0 +[ -x /usr/lib/pymilter/start.sh ] || exit 0 RETVAL=0 prog="milter" @@ -36,7 +36,7 @@ start() { mkdir -p /var/run/milter chown mail:mail /var/run/milter fi - daemon --check milter --user mail /var/log/milter/start.sh milter bms + daemon --check milter --user mail /usr/lib/pymilter/start.sh milter bms RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/milter diff --git a/pymilter.spec b/pymilter.spec index 8370cc08438c0632dc73ed3282b96781442e7dd2..054e90ba1e5761fb08abbf073ef55d61b15fc0e1 100644 --- a/pymilter.spec +++ b/pymilter.spec @@ -118,7 +118,7 @@ cd /var/log/milter #export PYTHONPATH=/usr/local/lib/python2.1/site-packages exec /usr/local/bin/python bms.py >>milter.log 2>&1 EOF -%else +%else # not aix4.1 cp start.sh $RPM_BUILD_ROOT%{libdir} mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d cp %{sysvinit} $RPM_BUILD_ROOT/etc/rc.d/init.d/milter @@ -147,7 +147,7 @@ python="%{python}" w q EOF -%endif +%endif # aix4.1 chmod a+x $RPM_BUILD_ROOT%{libdir}/start.sh mkdir -p $RPM_BUILD_ROOT/var/run/milter @@ -162,7 +162,7 @@ mkssys -s milter -p %{libdir}/start.sh -u 25 -S -n 15 -f 9 -G mail || : if [ $1 = 0 ]; then rmssys -s milter || : fi -%else +%else # not aix4.1 %post -n milter #echo "pythonsock has moved to /var/run/milter, update /etc/mail/sendmail.cf" /sbin/chkconfig --add milter @@ -179,13 +179,14 @@ fi if [ $1 = 0 ]; then /sbin/chkconfig --del spfmilter fi -%endif +%endif # aix4.1 %files %defattr(-,root,root) %config %{libdir}/start.sh /etc/logrotate.d/milter /etc/cron.daily/milter +#{libdir}/bms.py? %ifos aix4.1 %defattr(-,smmsp,mail) %else @@ -195,9 +196,6 @@ fi %dir /var/log/milter %dir /var/log/milter/save %config %{libdir}/bms.py -%if !%{redhat7} -%{libdir}/bms.py? -%endif %config(noreplace) /var/log/milter/strike3.txt %config(noreplace) /var/log/milter/softfail.txt %config(noreplace) /var/log/milter/fail.txt diff --git a/start.sh b/start.sh index 0fd23ba5c5c309264a1180d19c239226525b2471..e3c09f150aa9ca2a3fa4629314da21636debc63f 100755 --- a/start.sh +++ b/start.sh @@ -10,7 +10,5 @@ else cd /usr/lib/pymilter fi -cd /var/log/milter -exec >>${appname}.log 2>&1 ${python} ${script}.py & echo $! >/var/run/milter/${appname}.pid