From: Ian Jackson Date: Sun, 28 Feb 2010 12:28:20 +0000 (+0000) Subject: Parameterise rejection reasons X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~webstump/git?p=modbot-mtm.git;a=commitdiff_plain;h=fb2fab4c4dcc7ba27dc37e77055c7816a57e3fb5 Parameterise rejection reasons --- diff --git a/get-settings b/get-settings index 5c55e77..dda3f51 100644 --- a/get-settings +++ b/get-settings @@ -10,7 +10,7 @@ export GROUP ABBREV INFOHEADER MODEMAIL GROUPURL . ../global-settings export ROOTBASEDIR CGIBASEURL DOMAIN SLIMYDOMAIN OURUSER ADMIN export LOGGROUPPREFIX LOGGROUPEMAILPREFIX TESTGROUP -export STATICFILESURL STATICFILESDIR CGISCRIPTDIR +export STATICFILESURL STATICFILESDIR CGISCRIPTDIR SPAMFILTERINGADMIN BASEDIR=$ROOTBASEDIR/live-$ABBREV export BASEDIR diff --git a/install-substitutions b/install-substitutions index 8df87c0..4f09cd3 100755 --- a/install-substitutions +++ b/install-substitutions @@ -17,7 +17,7 @@ find -name '*.IN[O1]' ! -path '*/skeleton/*' -exec perl -e ' my $mode= (stat F)[2]; while () { s/\%(\w+)\%/ - exists($ENV{$1}) ? $ENV{$1} : die "$1 ?" + exists($ENV{$1}) ? $ENV{$1} : die "$1 undef at $f:$.\n" /ge; print G or die $!; } diff --git a/stump/etc/messages/abuse.IN1 b/stump/etc/messages/abuse.IN1 index 43ec7b6..6b3cc5d 100644 --- a/stump/etc/messages/abuse.IN1 +++ b/stump/etc/messages/abuse.IN1 @@ -4,12 +4,12 @@ However, we regret to inform you that your message has been rejected because it was rude, a flame, and/or personal abuse. Please refer to the group charter and moderation policy at - http://www.chiark.greenend.org.uk/urcm/ + %GROUPURL% and direct your queries to - urcm-moderators@chiark.greenend.org.uk + %MODEMAIL% If you have difficulty reaching the moderators (eg due to -spamfiltering) please tell postmaster@chiark.greenend.org.uk. +spamfiltering) please tell %SPAMFILTERINGADMIN%. Thank you, - Moderator. diff --git a/stump/etc/messages/charter.IN1 b/stump/etc/messages/charter.IN1 index 798f518..175e042 100644 --- a/stump/etc/messages/charter.IN1 +++ b/stump/etc/messages/charter.IN1 @@ -5,12 +5,12 @@ because it was not in accordance with the charter - for example, perhaps because it was off topic. Please refer to the group charter and moderation policy at - http://www.chiark.greenend.org.uk/urcm/ + %GROUPURL% and direct your queries to - urcm-moderators@chiark.greenend.org.uk + %MODEMAIL% If you have difficulty reaching the moderators (eg due to -spamfiltering) please tell postmaster@chiark.greenend.org.uk. +spamfiltering) please tell %SPAMFILTERINGADMIN%. Thank you, - Moderator. diff --git a/stump/etc/messages/crosspost.IN1 b/stump/etc/messages/crosspost.IN1 index 36391bf..82ee484 100644 --- a/stump/etc/messages/crosspost.IN1 +++ b/stump/etc/messages/crosspost.IN1 @@ -5,12 +5,12 @@ because it was crossposted. The moderators do not currently permit crossposting, but are keeping this policy under review. Please refer to the group charter and moderation policy at - http://www.chiark.greenend.org.uk/urcm/ + %GROUPURL% and direct your queries to - urcm-moderators@chiark.greenend.org.uk + %MODEMAIL% If you have difficulty reaching the moderators (eg due to -spamfiltering) please tell postmaster@chiark.greenend.org.uk. +spamfiltering) please tell %SPAMFILTERINGADMIN%. Thank you, - Moderator. diff --git a/stump/etc/messages/inflammatory.IN1 b/stump/etc/messages/inflammatory.IN1 index aa5512f..4636f28 100644 --- a/stump/etc/messages/inflammatory.IN1 +++ b/stump/etc/messages/inflammatory.IN1 @@ -8,12 +8,12 @@ uk.net.news.moderation instead. We will read it there and respond as appropriate. Please refer to the group charter and moderation policy at - http://www.chiark.greenend.org.uk/urcm/ + %GROUPURL% and direct your queries to - urcm-moderators@chiark.greenend.org.uk + %MODEMAIL% If you have difficulty reaching the moderators (eg due to -spamfiltering) please tell postmaster@chiark.greenend.org.uk. +spamfiltering) please tell %SPAMFILTERINGADMIN%. Thank you, - Moderator. diff --git a/stump/etc/messages/meta.IN1 b/stump/etc/messages/meta.IN1 index a48a218..e2edf36 100644 --- a/stump/etc/messages/meta.IN1 +++ b/stump/etc/messages/meta.IN1 @@ -10,12 +10,12 @@ uk.net.news.moderation instead. We will read it there and respond as appropriate. Please refer to the group charter and moderation policy at - http://www.chiark.greenend.org.uk/urcm/ + %GROUPURL% and direct your queries to - urcm-moderators@chiark.greenend.org.uk + %MODEMAIL% If you have difficulty reaching the moderators (eg due to -spamfiltering) please tell postmaster@chiark.greenend.org.uk. +spamfiltering) please tell %SPAMFILTERINGADMIN%. Thank you, - Moderator. diff --git a/stump/etc/messages/mistake.IN1 b/stump/etc/messages/mistake.IN1 index 6856bad..5fcf364 100644 --- a/stump/etc/messages/mistake.IN1 +++ b/stump/etc/messages/mistake.IN1 @@ -15,12 +15,12 @@ you for your submission and would encourage you to fix whatever the problem is and resubmit it, as applicable. You can find the group charter and moderation policy at: - http://www.chiark.greenend.org.uk/urcm/ + %GROUPURL% Please direct your queries to: - urcm-moderators@chiark.greenend.org.uk + %MODEMAIL% If you have difficulty reaching the moderators (eg due to -spamfiltering) please tell postmaster@chiark.greenend.org.uk. +spamfiltering) please tell %SPAMFILTERINGADMIN%. Thank you, - Moderator. diff --git a/stump/etc/messages/repetition.IN1 b/stump/etc/messages/repetition.IN1 index d02d3cd..21713d4 100644 --- a/stump/etc/messages/repetition.IN1 +++ b/stump/etc/messages/repetition.IN1 @@ -5,12 +5,12 @@ because it is a repetitious posting which we feel does not bring new information to the discussion. Please refer to the group charter and moderation policy at - http://www.chiark.greenend.org.uk/urcm/ + %GROUPURL% and direct your queries to - urcm-moderators@chiark.greenend.org.uk + %MODEMAIL% If you have difficulty reaching the moderators (eg due to -spamfiltering) please tell postmaster@chiark.greenend.org.uk. +spamfiltering) please tell %SPAMFILTERINGADMIN%. Thank you, - Moderator. diff --git a/stump/etc/messages/test.IN1 b/stump/etc/messages/test.IN1 index 4fd3e9e..820d29d 100644 --- a/stump/etc/messages/test.IN1 +++ b/stump/etc/messages/test.IN1 @@ -7,15 +7,15 @@ irritating to read and can drown out discussion in the newsgroup. So your message has been rejected and will not be posted. This isn't anything personal and we'll be happy to approve a message -from you with appropriate cycling content. +from you with appropriate on-topic content. Please refer to the group charter and moderation policy at - http://www.chiark.greenend.org.uk/urcm/ + %GROUPURL% and direct your queries to - urcm-moderators@chiark.greenend.org.uk + %MODEMAIL% If you have difficulty reaching the moderators (eg due to -spamfiltering) please tell postmaster@chiark.greenend.org.uk. +spamfiltering) please tell %SPAMFILTERINGADMIN%. Thank you, - Moderator. diff --git a/stump/etc/messages/thread.IN1 b/stump/etc/messages/thread.IN1 index 56c9ef5..1c6c1dd 100644 --- a/stump/etc/messages/thread.IN1 +++ b/stump/etc/messages/thread.IN1 @@ -8,12 +8,12 @@ All messages posted to this thread, regardless of who posted them, are autorejected, and this rejection does not single you out in any way. Please refer to the group charter and moderation policy at - http://www.chiark.greenend.org.uk/urcm/ + %GROUPURL% and direct your queries to - urcm-moderators@chiark.greenend.org.uk + %MODEMAIL% If you have difficulty reaching the moderators (eg due to -spamfiltering) please tell postmaster@chiark.greenend.org.uk. +spamfiltering) please tell %SPAMFILTERINGADMIN%. Thank you, - Moderator.