added additional instructions
added forkserver startup
segregated local variables
reduced duplicated code
---
 run |   41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/run b/run
index 53878c7..22c6029 100755
--- a/run
+++ b/run
@@ -1,11 +1,38 @@
 #!/bin/sh
-QMAILDUID=`id -u smtpd`
-NOFILESGID=`id -g smtpd`
+#
+# You might want/need to to edit these settings
+QPUSER=smtpd
+# limit qpsmtpd to 150MB memory, should be several times what is needed.
+MAXRAM=150000000
+BIN=/usr/local/bin
+PERL=/usr/bin/perl
+
+# You should not need to edit these.
+QMAILDUID=`id -u $QPUSER`
+NOFILESGID=`id -g $QPUSER`
+IP=`head -1 config/IP`
 LANG=C
-# by default limit qpsmtpd to 150MB memory which should be several
-# times what is needed.
-exec /usr/local/bin/softlimit -m 150000000 \
-  /usr/local/bin/tcpserver -c 10 -v -R -p \
-  -u $QMAILDUID -g $NOFILESGID `head -1 config/IP` smtp \
+
+# Remove the comments between the <start> and <end> tags to choose a
+# deployment model. See also: http://wiki.qpsmtpd.org/deploy:start
+
+# <start tcpserver>
+exec $BIN/softlimit -m $MAXRAM  \
+  $BIN/tcpserver -c 10 -v -R -p \
+  -u $QMAILDUID -g $NOFILESGID $IP smtp   \
   ./qpsmtpd 2>&1
+# <end tcpserver>
+
 
+# <start forkserver>
+#exec 2>&1 \
+#sh -c "
+#  exec $BIN/softlimit -m $MAXRAM   \
+#    $PERL -T ./qpsmtpd-forkserver  \
+#      --listen-address $IP         \
+#      --port 25                    \
+#      --limit-connections 15       \
+#      --max-from-ip 5              \
+#      --user $QPUSER
+#"
+# <end forkserver>
-- 
1.7.9.6

Reply via email to