Changes - j0ke.net Open Build Service

Changes of Revision 24

[-] [+]	Changed	netqmail.spec
@@ -61,6 +61,8 @@ Source1: qmail-%{qversion}-supervise.tar.bz2 Source2: qmail-%{qversion}-binfiles.tar.bz2 Source3: smtpplugins +Source4: msaplugins +Source5: msa-spp-plugins.tar.bz2 Buildroot: %{_tmppath}/%{name}-%{version}-build BuildRequires: openssl-devel krb5-devel openldap2-client qmail_prepare_build %if 0%{?suse_version} >= 1030 @@ -315,9 +317,14 @@ bl.spamcop.net reject 127.0.0.2 Spamcop - http://spamcop.net/ EOF cp %{S:3} $RPM_BUILD_ROOT%{qdir}/control/ + cp %{S:4} $RPM_BUILD_ROOT%{qdir}/control/ chmod 644 * popd +# install default spp plugins + +tar xfj %{S:5} -C $RPM_BUILD_ROOT%{qdir}/ + # sendmail compatability and qmailctl links #---------------------------------------------------------------------------------- pushd $RPM_BUILD_ROOT%{_sbindir} @@ -339,6 +346,7 @@ echo '%{LOCALNET}:allow,RELAYCLIENT=""' >> $RPM_BUILD_ROOT%{_sysconfdir}/tcprules.d/tcp.smtp fi echo ':allow,RBL="",RCPTCHECK=""' >> $RPM_BUILD_ROOT%{_sysconfdir}/tcprules.d/tcp.smtp +echo '127.:allow,SPPCONFFILE="/var/qmail/control/msaplugins"' > $RPM_BUILD_ROOT%{_sysconfdir}/tcprules.d/tcp.msa # remove conflicting files from other distries rm -f $RPM_BUILD_ROOT%{_mandir}/man1/maildirmake.1.gz @@ -584,6 +592,7 @@ # config (qmail) #---------------------------------------------------------------------------------- %attr(0644,root,qmail) %config(noreplace) %{qdir}/control/* +%attr(0644,root,qmail) %config(noreplace) %{qdir}/plugins/* # doc dir #---------------------------------------------------------------------------------- @@ -593,6 +602,7 @@ #---------------------------------------------------------------------------------- %attr(0750,qmaill,nofiles) %dir %{qlog} %attr(0750,qmaill,nofiles) %dir %{qlog}/smtpd +%attr(0750,qmaill,nofiles) %dir %{qlog}/msa # man pages #---------------------------------------------------------------------------------- @@ -638,6 +648,14 @@ %attr(0600,qmaill,qmail) %{qdir}/supervise/qmail-smtpd/env/* %attr(0751,qmaill,qmail) %{qdir}/supervise/qmail-smtpd/run %attr(0751,qmaill,qmail) %{qdir}/supervise/qmail-smtpd/log/run +%attr(1700,qmaill,qmail) %dir %{qdir}/supervise/qmail-msa +%attr(0700,qmaill,qmail) %dir %{qdir}/supervise/qmail-msa/env +%attr(0700,qmaill,qmail) %dir %{qdir}/supervise/qmail-msa/log +%attr(0700,qmaill,qmail) %dir %{qdir}/supervise/qmail-msa/supervise +%attr(0600,qmaill,qmail) %{qdir}/supervise/qmail-msa/env/* +%attr(0751,qmaill,qmail) %{qdir}/supervise/qmail-msa/run +%attr(0751,qmaill,qmail) %{qdir}/supervise/qmail-msa/log/run + # users dir #---------------------------------------------------------------------------------- @@ -671,6 +689,9 @@ #---------------------------------------------------------------------------------- %changelog #---------------------------------------------------------------------------------- -* Sun Apr 28 2008 Carsten Schoene <cs@linux-administrator.com> 1.06-1 +* Wed Apr 30 2008 Carsten Schoene <cs@linux-administrator.com> 1.06-2 +- add msa service and spp config file + plugins + +* Sun Apr 27 2008 Carsten Schoene <cs@linux-administrator.com> 1.06-1 - initial netqmail package, adapted from qmail-ldap
	Added	msa-spp-plugins.tar.bz2 ^
[-] [+]	Added	msaplugins ^
@@ -0,0 +1,27 @@ +# +# qmail-spp configuration file +# + +# plugins to execute on client's connection +[connection] + + +# plugins to execute on HELO/EHLO commands +[helo] + + +# plugins to execute on MAIL command +[mail] +plugins/chkauth.sh + +# plugins to execute on RCPT command +[rcpt] + + +# plugins to execute on DATA command +[data] + + +## NOTE: use below section only if your installation supports it +# plugins to execute on AUTH command +#[auth]
[-] [+]	Added	qmail-1.03-supervise.tar.bz2/qmail-msa ^
+(directory)
[-] [+]	Added	qmail-1.03-supervise.tar.bz2/qmail-msa/env ^
+(directory)
[-] [+]	Added	qmail-1.03-supervise.tar.bz2/qmail-msa/env/LOGLEVEL ^
@@ -0,0 +1 @@ +3
[-] [+]	Added	qmail-1.03-supervise.tar.bz2/qmail-msa/env/SPPCONFFILE ^
@@ -0,0 +1 @@ +/var/qmail/control/msaplugins
[-] [+]	Added	qmail-1.03-supervise.tar.bz2/qmail-msa/log ^
+(directory)
[-] [+]	Added	qmail-1.03-supervise.tar.bz2/qmail-msa/log/run ^
@@ -0,0 +1,16 @@ +#!/bin/sh +# +# logging for SUBMISSION +# + +PATH="$QMAIL/bin:$PATH" + +SETUIDGID=/usr/sbin/setuidgid # directory for setuidgid +MULTILOG=/usr/sbin/multilog # directory for multilog +PROG=msa +LOGDIR=/var/log/qmail/$PROG # directory for qmail-smtpd log +LOGUSER=qmaill # user to own logs +LOGCOUNT=10 # number of log files +LOGSIZE=5000000 # maximum file size for log files + +exec $SETUIDGID $LOGUSER $MULTILOG t s$LOGSIZE $LOGDIR
[-] [+]	Added	qmail-1.03-supervise.tar.bz2/qmail-msa/run ^
@@ -0,0 +1,36 @@ +#!/bin/sh +# +# SUBMISSION service + +QMAIL="/var/qmail" +QMAILDUID=`id -u qmaild` +NOFILESGID=`id -g qmaild` +MAXSMTPD=`head -1 $QMAIL/control/concurrencyincoming` +ME=`head -1 $QMAIL/control/me` +TCP_DIR="/etc/tcprules.d" + +# source the environemt in ./env +eval `env - PATH=$PATH envdir ./env awk '\ + BEGIN { for (i in ENVIRON) \ + if (i != "PATH") { \ + printf "export %s=\"%s\"\\n", i, ENVIRON[i] \ + } \ + }'` + + +if [ -z "$QMAILDUID" -o -z "$NOFILESGID" -o -z "$MAXSMTPD" -o -z "$ME" ]; then + echo "QMAILDUID, NOFILESGID, MAXSMTPD, or ME is unset in" + echo "$QMAIL/supervise/qmail-msa/run" + exit 1 +fi + +if [ ! -f "$QMAIL/control/rcpthosts" ]; then + echo "No $QMAIL/control/rcpthosts!" + echo "Refusing to start SMTP listener because it'll create an open relay" + exit 1 +fi + +# start SMTP service +exec /usr/sbin/softlimit -m 16000000 \ + /usr/bin/tcpserver -v -R -l "$ME" -x $TCP_DIR/tcp.msa.cdb -c "$MAXSMTPD" \ + -u "$QMAILDUID" -g "$NOFILESGID" 0 submission $QMAIL/bin/qmail-smtpd 2>&1
[-] [+]	Added	qmail-1.03-supervise.tar.bz2/qmail-msa/supervise ^
+(directory)