From dfe8c1cd83d494859fddacf1f56a6b64982386de Mon Sep 17 00:00:00 2001 From: Matt Simerson Date: Thu, 25 Apr 2013 21:31:07 -0400 Subject: [PATCH] revert movement of qp bins to bin/ plugin dir, config dir, spool dir, all have different logic about where/how to find their config. The logic needs some untangling and unification before attempting this again. --- bin/qpsmtpd => qpsmtpd | 0 bin/qpsmtpd-async => qpsmtpd-async | 0 bin/qpsmtpd-forkserver => qpsmtpd-forkserver | 0 bin/qpsmtpd-prefork => qpsmtpd-prefork | 0 run.forkserver | 2 +- run.tcpserver | 2 +- 6 files changed, 2 insertions(+), 2 deletions(-) rename bin/qpsmtpd => qpsmtpd (100%) rename bin/qpsmtpd-async => qpsmtpd-async (100%) rename bin/qpsmtpd-forkserver => qpsmtpd-forkserver (100%) rename bin/qpsmtpd-prefork => qpsmtpd-prefork (100%) diff --git a/bin/qpsmtpd b/qpsmtpd similarity index 100% rename from bin/qpsmtpd rename to qpsmtpd diff --git a/bin/qpsmtpd-async b/qpsmtpd-async similarity index 100% rename from bin/qpsmtpd-async rename to qpsmtpd-async diff --git a/bin/qpsmtpd-forkserver b/qpsmtpd-forkserver similarity index 100% rename from bin/qpsmtpd-forkserver rename to qpsmtpd-forkserver diff --git a/bin/qpsmtpd-prefork b/qpsmtpd-prefork similarity index 100% rename from bin/qpsmtpd-prefork rename to qpsmtpd-prefork diff --git a/run.forkserver b/run.forkserver index 64b9df3..2bdadbf 100755 --- a/run.forkserver +++ b/run.forkserver @@ -13,7 +13,7 @@ LANG=C exec 2>&1 \ sh -c " exec $BIN/softlimit -m $MAXRAM \ - $PERL -T ./bin/qpsmtpd-forkserver \ + $PERL -T ./qpsmtpd-forkserver \ --listen-address $IP \ --port 25 \ --port 587 \ diff --git a/run.tcpserver b/run.tcpserver index ca543a2..d5b4c99 100755 --- a/run.tcpserver +++ b/run.tcpserver @@ -19,6 +19,6 @@ NOFILESGID=`id -g $QPUSER` exec $BIN/softlimit -m $MAXRAM \ $BIN/tcpserver -c 10 -v -R -p \ -u $QMAILDUID -g $NOFILESGID $IP $PORT \ - ./bin/qpsmtpd 2>&1 + ./qpsmtpd 2>&1 #