diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | doc/nullmailer-queue.8 | 6 | ||||
| -rw-r--r-- | doc/nullmailer-send.8 | 6 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | scripts/nullmailer.service | 4 | ||||
| -rw-r--r-- | spec | 11 | ||||
| -rw-r--r-- | test/functions.in | 2 | ||||
| -rw-r--r-- | test/tests/inject/queue | 8 | ||||
| -rw-r--r-- | test/tests/queue/rewrite | 4 | ||||
| -rw-r--r-- | test/tests/smtpd | 2 |
11 files changed, 26 insertions, 23 deletions
diff --git a/Makefile.am b/Makefile.am index 0d7844f..b952ee0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -localstatedir = @localstatedir@/nullmailer +localstatedir = @localstatedir@/spool/nullmailer sysconfdir = @sysconfdir@/nullmailer EXTRA_DIST = BUGS HOWTO INSTALL TODO spec \ @@ -31,6 +31,8 @@ Changes in version 2.0 - Fixed nullmailer-inject and -queue to handle the null (empty) sender address. Needed for RFC 3798 (Message Disposition Notification). +- Moved spool directory to /var/spool/nullmailer like other MTAs. + Development of this version has been sponsored by FutureQuest, Inc. ossi@FutureQuest.net http://www.FutureQuest.net/ ------------------------------------------------------------------------------- diff --git a/doc/nullmailer-queue.8 b/doc/nullmailer-queue.8 index 98071b1..291ea65 100644 --- a/doc/nullmailer-queue.8 +++ b/doc/nullmailer-queue.8 @@ -35,13 +35,13 @@ If this file is not empty, its contents will override the envelope sender on all messages. .SH OTHER FILES .TP -.B /var/nullmailer/queue +.B /var/spool/nullmailer/queue The directory into which the completed messages are moved. .TP -.B /var/nullmailer/tmp +.B /var/spool/nullmailer/tmp The directory in which messages are formed temporarily. .TP -.B /var/nullmailer/trigger +.B /var/spool/nullmailer/trigger A pipe used to trigger .BR nullmailer-send to immediately start sending the message from the queue. diff --git a/doc/nullmailer-send.8 b/doc/nullmailer-send.8 index ceb7cfe..d7835d4 100644 --- a/doc/nullmailer-send.8 +++ b/doc/nullmailer-send.8 @@ -175,13 +175,13 @@ Don't abort a TLS connection if the server certificate fails validation. Use this only if you know the server uses an invalid certificate. .SH FILES .TP -.B /var/nullmailer/failed +.B /var/spool/nullmailer/failed The failed message queue. .TP -.B /var/nullmailer/queue +.B /var/spool/nullmailer/queue The outgoing message queue. .TP -.B /var/nullmailer/trigger +.B /var/spool/nullmailer/trigger A trigger file to cause immediate delivery. .TP .B /usr/local/etc/nullmailer diff --git a/lib/Makefile.am b/lib/Makefile.am index 2671f1f..6740629 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -36,7 +36,7 @@ libnullmailer.a: mergelib.sh libmisc.a fdbuf/libfdbuf.a \ defines.cc: Makefile make_defines.sh @echo Creating defines.cc @sh $(srcdir)/make_defines.sh \ - @localstatedir@/nullmailer \ + @localstatedir@/spool/nullmailer \ @sysconfdir@/nullmailer \ @libexecdir@/nullmailer \ @bindir@ \ diff --git a/scripts/nullmailer.service b/scripts/nullmailer.service index 8832dd0..1412810 100644 --- a/scripts/nullmailer.service +++ b/scripts/nullmailer.service @@ -2,12 +2,12 @@ Description=Nullmailer relay-only MTA Requires=network.target After=local-fs.target -ConditionPathExists=/var/nullmailer/queue +ConditionPathExists=/var/spool/nullmailer/queue ConditionPathExists=/etc/nullmailer/defaultdomain ConditionPathExists=/etc/nullmailer/me [Service] -WorkingDirectory=/var/nullmailer +WorkingDirectory=/var/spool/nullmailer ExecStart=/usr/sbin/nullmailer-send User=nullmail Group=nullmail @@ -34,13 +34,13 @@ make rm -fr $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc mkdir -p $RPM_BUILD_ROOT/usr/lib -mkdir -p $RPM_BUILD_ROOT/var/nullmailer/service/log +mkdir -p $RPM_BUILD_ROOT/var/service/nullmailer/log mkdir -p $RPM_BUILD_ROOT/var/log/nullmailer make DESTDIR=$RPM_BUILD_ROOT install-strip ln -s ../sbin/sendmail $RPM_BUILD_ROOT/usr/lib/sendmail -install scripts/nullmailer.run $RPM_BUILD_ROOT/var/nullmailer/service/run -install scripts/nullmailer-log.run $RPM_BUILD_ROOT/var/nullmailer/service/log/run +install scripts/nullmailer.run $RPM_BUILD_ROOT/var/service/nullmailer/run +install scripts/nullmailer-log.run $RPM_BUILD_ROOT/var/service/nullmailer/log/run %clean rm -rf $RPM_BUILD_ROOT @@ -55,7 +55,7 @@ fi %post if ! [ -L /service/nullmailer ]; then - svc-add /var/nullmailer/service nullmailer + svc-add /var/service/nullmailer fi if ! [ -s /etc/nullmailer/me ]; then /bin/hostname --fqdn >/etc/nullmailer/me @@ -91,4 +91,5 @@ fi /usr/sbin/nullmailer-send /usr/sbin/sendmail %dir /var/log/nullmailer -/var/nullmailer +/var/service/nullmailer +/var/spool/nullmailer diff --git a/test/functions.in b/test/functions.in index ab39b11..87bd9d3 100644 --- a/test/functions.in +++ b/test/functions.in @@ -1,7 +1,7 @@ srcdir=@SRCDIR@ tmpdir=@TMPDIR@ SYSCONFDIR=@TMPDIR@/etc/nullmailer -QUEUEDIR=@TMPDIR@/var/nullmailer +QUEUEDIR=@TMPDIR@/var/spool/nullmailer rm -rf $tmpdir mkdir -p \ $QUEUEDIR/{failed,queue,tmp} \ diff --git a/test/tests/inject/queue b/test/tests/inject/queue index 0b26c27..0b99d39 100644 --- a/test/tests/inject/queue +++ b/test/tests/inject/queue @@ -3,12 +3,12 @@ echo 'Testing that inject queues messages properly.' echo 'To: nobody' | inject -test $( ls $tmpdir/var/nullmailer/queue | wc -l ) = 1 -egrep -i '^to: *nobody' $tmpdir/var/nullmailer/queue/* >/dev/null +test $( ls $tmpdir/var/spool/nullmailer/queue | wc -l ) = 1 +egrep -i '^to: *nobody' $tmpdir/var/spool/nullmailer/queue/* >/dev/null echo 'Testing that inject honors $NULLMAILER_QUEUE.' -rm -f $tmpdir/var/nullmailer/queue/* +rm -f $tmpdir/var/spool/nullmailer/queue/* NULLMAILER_QUEUE=/bin/cat echo 'To: nobody' | inject >/dev/null -test $( ls $tmpdir/var/nullmailer/queue | wc -l ) = 0 +test $( ls $QUEUEDIR/queue | wc -l ) = 0 diff --git a/test/tests/queue/rewrite b/test/tests/queue/rewrite index 96d8d13..3e42d9a 100644 --- a/test/tests/queue/rewrite +++ b/test/tests/queue/rewrite @@ -3,8 +3,8 @@ que() { set -e ../src/nullmailer-queue && \ - cat $tmpdir/var/nullmailer/queue/* && \ - rm -f $tmpdir/var/nullmailer/queue/* + cat $QUEUEDIR/queue/* && \ + rm -f $QUEUEDIR/queue/* } que-recip() { set -e diff --git a/test/tests/smtpd b/test/tests/smtpd index 58f3da6..59ca303 100644 --- a/test/tests/smtpd +++ b/test/tests/smtpd @@ -69,7 +69,7 @@ diff -u - $out <<EOF EOF echo ' testing queued message envelope' -qf=$tmpdir/var/nullmailer/queue/* +qf=$QUEUEDIR/queue/* grep -q '^f@example.com$' $qf grep -q '^r@example.com$' $qf grep -q '^r2@example.com$' $qf |