Actual error messages

[modbot-ulm.git] / stump / etc / modenv.INO

diff --git a/stump/etc/modenv.INO b/stump/etc/modenv.INO
index 037542880077a2e42a9df02fd5a3a7d802a65d44..eebf1d508d3ee0199321f1db48c1153ab37e5302 100755 (executable)
--- a/stump/etc/modenv.INO
+++ b/stump/etc/modenv.INO
@@ -1,4 +1,5 @@
 #!/bin/bash
+###
 #
 # MAIN CONFIGURATION FILE
 #
@@ -18,6 +19,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 +35,30 @@ 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%
+'
+
+sanitise_and_quote_email () {
+       perl -pe '
+               s/ %OURUSER% \+ [-+/0-9a-z]* \@
+                  (\Q %DOMAIN% | %SLIMYDOMAIN \E) \b
+                /%OURUSER%+?\@$1/igx
+                       unless m/^$/..0;
+               s/^/> /;
+               ' "$@"
+}
+
 #######################################################################
 # STUMP enforces limitations on the maximum number of newsgroups
 # used in Newsgroups: header line. The default value is 5. I
@@ -85,7 +113,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 +153,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 +196,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
 #