Skip to content
Snippets Groups Projects
Commit 021ea967 authored by Stuart Gathman's avatar Stuart Gathman
Browse files

Fixes from test on EL5.

parent a490e795
Branches
Tags
No related merge requests found
...@@ -156,6 +156,14 @@ python="%{python}" ...@@ -156,6 +156,14 @@ python="%{python}"
w w
q q
EOF EOF
ed $RPM_BUILD_ROOT%{libdir}/start.sh <<'EOF'
/^python=/
c
python="%{python}"
.
w
q
EOF
%endif %endif
chmod a+x $RPM_BUILD_ROOT%{libdir}/start.sh chmod a+x $RPM_BUILD_ROOT%{libdir}/start.sh
......
[milter] [milter]
# The socket used to communicate with sendmail # The socket used to communicate with sendmail
socketname = /tmp/spfmiltersock socketname = /var/run/milter/spfmiltersock
# Name of the milter given to sendmail # Name of the milter given to sendmail
name = pyspffilter name = pyspffilter
# Trusted relays such as secondary MXes that should not have SPF checked. # Trusted relays such as secondary MXes that should not have SPF checked.
;trusted_relay = ;trusted_relay =
# Internal networks that should not have SPF checked. # 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. # See http://www.openspf.com for more info on SPF.
[spf] [spf]
# Use sendmail access map or similar format for detailed spf policy. # Use sendmail access map or similar format for detailed spf policy.
# SPF entries in the access map will override defaults. # 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 # Connections that get an SPF pass for a pretend MAIL FROM of
# postmaster@sometrustedforwarder.com skip SPF checks for the real MAIL FROM. # postmaster@sometrustedforwarder.com skip SPF checks for the real MAIL FROM.
# This is for non-SRS forwarders. It is a simple implementation that # This is for non-SRS forwarders. It is a simple implementation that
......
...@@ -2,14 +2,15 @@ ...@@ -2,14 +2,15 @@
appname="$1" appname="$1"
script="${2:-${appname}}" script="${2:-${appname}}"
datadir=/var/log/milter datadir=/var/log/milter
python="python2.4"
exec >>${datadir}/${appname}.log 2>&1 exec >>${datadir}/${appname}.log 2>&1
if test -s ${datadir}/${script}.py; then 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 else
cd /usr/lib/pymilter cd /usr/lib/pymilter
fi fi
cd /var/log/milter cd /var/log/milter
exec >>${appname}.log 2>&1 exec >>${appname}.log 2>&1
python2.4 ${appname}.py & ${python} ${appname}.py &
echo $! >/var/run/milter/${appname}.pid echo $! >/var/run/milter/${appname}.pid
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment