diff --git a/milter.spec b/milter.spec index 068e7d838a305a4050e2d512187dd6bce141ab8e..a3eae8579d8b5092a3e0347224e56be17498f9eb 100644 --- a/milter.spec +++ b/milter.spec @@ -156,6 +156,14 @@ python="%{python}" w q EOF +ed $RPM_BUILD_ROOT%{libdir}/start.sh <<'EOF' +/^python=/ +c +python="%{python}" +. +w +q +EOF %endif chmod a+x $RPM_BUILD_ROOT%{libdir}/start.sh diff --git a/spfmilter.cfg b/spfmilter.cfg index 3a2a7c2d057eedc05b0fea01b331480e7f7b6791..52f4d3414f680d7c340855e2ab91638f003cffe5 100644 --- a/spfmilter.cfg +++ b/spfmilter.cfg @@ -1,18 +1,18 @@ [milter] # The socket used to communicate with sendmail -socketname = /tmp/spfmiltersock +socketname = /var/run/milter/spfmiltersock # Name of the milter given to sendmail name = pyspffilter # Trusted relays such as secondary MXes that should not have SPF checked. ;trusted_relay = # Internal networks that should not have SPF checked. -internal_connect = 127.0.0.1,192.168.0.0/16 +internal_connect = 127.0.0.1,192.168.0.0/16,10.0.0.0/8 # See http://www.openspf.com for more info on SPF. [spf] # Use sendmail access map or similar format for detailed spf policy. # SPF entries in the access map will override defaults. -;access_file = /etc/mail/access.db +access_file = /etc/mail/access.db # Connections that get an SPF pass for a pretend MAIL FROM of # postmaster@sometrustedforwarder.com skip SPF checks for the real MAIL FROM. # This is for non-SRS forwarders. It is a simple implementation that diff --git a/start.sh b/start.sh index d8de1c4d91fa1182141e7c052d2048c936f86088..49458408eb1917fc864ddab83597f99706ee30c6 100755 --- a/start.sh +++ b/start.sh @@ -2,14 +2,15 @@ appname="$1" script="${2:-${appname}}" datadir=/var/log/milter +python="python2.4" exec >>${datadir}/${appname}.log 2>&1 if test -s ${datadir}/${script}.py; then - cd %{datadir} # use version in log dir if it exists for debugging + cd ${datadir} # use version in log dir if it exists for debugging else cd /usr/lib/pymilter fi cd /var/log/milter exec >>${appname}.log 2>&1 -python2.4 ${appname}.py & +${python} ${appname}.py & echo $! >/var/run/milter/${appname}.pid