Parameterise rejection reasons

diff --git a/get-settings b/get-settings
index 5c55e77125156bf23c0bdbdffb41baa6abb03b50..dda3f5156674149e2c293075be4e4ad41eed265d 100644 (file)
--- 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 8df87c0e4f558a7cde3926984ae6b04a810b40c3..4f09cd3c06ed52ea06180cba2c6f8f8cbb652d71 100755 (executable)
--- 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 (<F>) {
                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 43ec7b69bc5bd0862d576e084c56083358dc4bde..6b3cc5de7b354396f7f2d837cb30db7ab01fef78 100644 (file)
--- 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 798f5182f130e0cef29f1fba19784e3977b9a90c..175e0425a4d5d955077ea579f71c9bc59384c9b4 100644 (file)
--- 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 36391bff1d3d541d4bfc62855d80799663ebf3cb..82ee4843962bbc836adceb3e605a22b803bb2390 100644 (file)
--- 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 aa5512fc5f8fdf4a04d2f057951cfebb9ee2d4fe..4636f28d2e67bdf85759e25b2a4bf8ef16e65a93 100644 (file)
--- 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 a48a2182abdbde8fa4b4fea1b80f0cb60d404909..e2edf3640cdba32b205a3efa42ee9995ee80907c 100644 (file)
--- 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 6856baddd50ea0f6afd01613fb74f75bed64a655..5fcf3649f5578d859b83b875d1d8cb41a52064d6 100644 (file)
--- 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 d02d3cdeb92bc5518371d4b38dc358e513e4819c..21713d43835ff325468278f8946951d41c2ad562 100644 (file)
--- 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 4fd3e9eef7cd050499cac70dc0bddcf87612d306..820d29d69faa45120e7292a90b92b9db8e63f549 100644 (file)
--- 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 56c9ef5d9904fc95ec6a5ec168b374d39dda8cd8..1c6c1dd4e7f3f0779aaf456a0dc6c63d992d858e 100644 (file)
--- 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.