X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~webstump/git?a=blobdiff_plain;f=stump%2Fetc%2Fmodenv.INO;h=ed322f6c63930267fd499a89a6081d14f2a0f041;hb=379fd49b65b40d28afeeb3741addfc7ec3d2d04c;hp=037542880077a2e42a9df02fd5a3a7d802a65d44;hpb=221ebe04cb5068f3a138c3d2469caf69a21058e9;p=modbot-mtm.git

diff --git a/stump/etc/modenv.INO b/stump/etc/modenv.INO
index 0375428..ed322f6 100755
--- a/stump/etc/modenv.INO
+++ b/stump/etc/modenv.INO
@@ -1,4 +1,5 @@
 #!/bin/bash
+###
 #
 # MAIN CONFIGURATION FILE
 #
@@ -9,6 +10,8 @@
 # to real moderation scripts. Follow the instructions.
 #
 
+set -e
+
 #######################################################################
 # this is the root directory where moderation software & config
 # resides. Make sure that sendmail is in the PATH.
@@ -18,6 +21,9 @@
 MNG_ROOT=%BASEDIR%/stump
 exec >>%BASEDIR%/errs 2>&1
 
+printf "============ %s " "$*"
+date
+
 export MNG_ROOT BASEDIR
 
 # Add bin and local/bin to PATH
@@ -31,6 +37,23 @@ export PATH
 
 NEWSGROUP="%GROUP%"; export NEWSGROUP
 
+#######################################################################
+# Email handling and mangling
+
+MAILOUT_RECVACK_FORMAIL_ARGS='
+	-I Bcc:%OURUSER%+%ABBREV%-internal-log+mailout@%DOMAIN%
+'
+MAILOUT_ACCEPTACK_FORMAIL_ARGS='
+	-I Bcc:%OURUSER%+mtm-internal-log+mailout@%DOMAIN%
+'
+MAILOUT_REJECT_FORMAIL_ARGS='
+	-I Bcc:%OURUSER%+%ABBREV%-internal-log+mailout@%DOMAIN%
+	-I Bcc:%OURUSER%+%ABBREV%-internal-reject-copy@%DOMAIN%
+'
+export MAILOUT_RECVACK_FORMAIL_ARGS
+export MAILOUT_ACCEPTACK_FORMAIL_ARGS
+export MAILOUT_REJECT_FORMAIL_ARGS
+
 #######################################################################
 # STUMP enforces limitations on the maximum number of newsgroups
 # used in Newsgroups: header line. The default value is 5. I
@@ -85,7 +108,7 @@ export PGP
 #
 # this MUST be dfined EVEN if PGP is set to "none".
 # This goes into your Approved: field.
-PMUSER_APPROVAL="%GROUP% approval key <urcm-moderators@chiark.greenend.org.uk>"
+PMUSER_APPROVAL="%GROUP% approval key <%MODEMAIL%>"
 export PMUSER_APPROVAL
 
 ######################################################################
@@ -125,7 +148,7 @@ PMAPP="pmapp"; export PMAPP
 # a devnulled address, since a lot of rejections/acks will bounce
 # and there is no need for a human being to see the bounces.
 #
-MUNGED_ADDRESS=%OURUSER%+urcm-bounces@%DOMAIN%
+MUNGED_ADDRESS=%OURUSER%+%ABBREV%-bounces@%DOMAIN%
 export MUNGED_ADDRESS
 
 
@@ -168,13 +191,13 @@ BOARD=%MODEMAIL%; export BOARD
 
 ######################################################################
 # address for the no-ack requests.
-NOACK=%OURUSER%+urcm-noack@chiark.greenend.org.uk
+NOACK=%OURUSER%+%ABBREV%-noack@chiark.greenend.org.uk
 export NOACK
 
 ######################################################################
 # Official address for submissions to the newsgroup.
 #
-SUBMIT=%OURUSER%+urcm+%KEYSUBMIT%@chiark.greenend.org.uk; export SUBMIT
+SUBMIT=%OURUSER%+%ABBREV%+%KEYSUBMIT%@chiark.greenend.org.uk; export SUBMIT
 
 ###################################################################### Flags
 #