aboutsummaryrefslogtreecommitdiffstats
path: root/script
diff options
context:
space:
mode:
authorFrancis Irving <francis@mysociety.org>2009-10-29 01:00:08 +0000
committerFrancis Irving <francis@mysociety.org>2009-10-29 01:00:08 +0000
commit31c2f03226b55f9384664cd435728d3a0061e23a (patch)
tree97094f9986038323ef00d698072f9f66ed3076d6 /script
parent0b712a1ebed0b194252ae6d8f93c5cc612492208 (diff)
New directory for git.
Diffstat (limited to 'script')
-rwxr-xr-xscript/mailin10
1 files changed, 5 insertions, 5 deletions
diff --git a/script/mailin b/script/mailin
index eeaf0e5aa..9bb233ac5 100755
--- a/script/mailin
+++ b/script/mailin
@@ -3,18 +3,18 @@
OUTPUT=/tmp/foi-malin-$RANDOM$RANDOM$RANDOM$RANDOM.txt
cd `dirname $0`
-cd ../../
-source shlib/deployfns
+cd ../
+source commonlib/shlib/deployfns
-read_conf foi/config/general
+read_conf config/general
-if ! ./foi/script/runner 'RequestMailer.receive(STDIN.read)' >$OUTPUT 2>$OUTPUT
+if ! ./script/runner 'RequestMailer.receive(STDIN.read)' >$OUTPUT 2>$OUTPUT
then
# we should never get an error here, unless the database is down or similar
# send error to administators (use mutt for MIME encoding)
SUBJ="Mail import error for $OPTION_DOMAIN"
- BODY="There was an error running the RequestMailer.receive command in script/foi/mailin. See attached for details. This might be quite serious, such as the database was down, or might be an email with corrupt headers that Rails is choking on. The email was returned with an exit code 75, which for Exim at least means the MTA will try again later. A well configured installation of this code will separately have had Exim make a backup copy of the email in a separate mailbox, just in case."
+ BODY="There was an error running the RequestMailer.receive command in script/mailin. See attached for details. This might be quite serious, such as the database was down, or might be an email with corrupt headers that Rails is choking on. The email was returned with an exit code 75, which for Exim at least means the MTA will try again later. A well configured installation of this code will separately have had Exim make a backup copy of the email in a separate mailbox, just in case."
echo "$BODY" | /usr/bin/mutt -s "$SUBJ" -a $OUTPUT $OPTION_CONTACT_EMAIL
# tell exim error was temporary, so try again later (no point bouncing message to authority)