diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/crontab.ugly | 3 | ||||
| -rw-r--r-- | conf/general-example | 3 | ||||
| -rw-r--r-- | conf/httpd.conf | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/conf/crontab.ugly b/conf/crontab.ugly index 06911dd30..ad76bb6c4 100644 --- a/conf/crontab.ugly +++ b/conf/crontab.ugly @@ -4,7 +4,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: matthew@mysociety.org. WWW: http://www.mysociety.org/ # -# $Id: crontab.ugly,v 1.9 2007-06-15 14:57:51 matthew Exp $ +# $Id: crontab.ugly,v 1.10 2007-06-17 09:40:50 matthew Exp $ PATH=/usr/local/bin:/usr/bin:/bin !!(* if ($vhost eq "matthew.bci.mysociety.org") { *)!! @@ -14,6 +14,7 @@ MAILTO=team@fixmystreet.com !!(* } *)!! */5 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock /data/vhost/!!(*= $vhost *)!!/mysociety/bci/bin/send-reports || echo "stalled?" +15,45 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/import-flickr.lock /data/vhost/!!(*= $vhost *)!!/mysociety/bci/bin/import-flickr || echo "stalled?" 3 9,12,15,18 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock "/data/vhost/!!(*= $vhost *)!!/mysociety/bci/bin/send-reports --verbose" || echo "stalled?" 2 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-alerts.lock /data/vhost/!!(*= $vhost *)!!/mysociety/bci/bin/send-alerts || echo "stalled?" 0,30 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-questionnaires.lock /data/vhost/!!(*= $vhost *)!!/mysociety/bci/bin/send-questionnaires || echo "stalled?" diff --git a/conf/general-example b/conf/general-example index 2fe7d66f4..921dcafc6 100644 --- a/conf/general-example +++ b/conf/general-example @@ -14,7 +14,7 @@ * Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved. * Email: francis@mysociety.org; WWW: http://www.mysociety.org * - * $Id: general-example,v 1.11 2007-06-15 14:57:51 matthew Exp $ + * $Id: general-example,v 1.12 2007-06-17 09:40:51 matthew Exp $ * */ @@ -45,4 +45,5 @@ define('OPTION_GAZE_URL', 'http://gaze.mysociety.org/gaze'); define('OPTION_SMTP_SMARTHOST', 'localhost'); +define('OPTION_FLICKR_API', ''); ?> diff --git a/conf/httpd.conf b/conf/httpd.conf index f2e0bc856..a12f6c0cc 100644 --- a/conf/httpd.conf +++ b/conf/httpd.conf @@ -20,7 +20,7 @@ # Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org # -# $Id: httpd.conf,v 1.17 2007-06-16 21:44:53 matthew Exp $ +# $Id: httpd.conf,v 1.18 2007-06-17 09:40:51 matthew Exp $ DirectoryIndex index.cgi @@ -32,6 +32,8 @@ RewriteRule ^/[Aa]/([0-9A-Za-z]{16}).*$ /alert.cgi?token=$1 RewriteRule ^/[Cc]/([0-9A-Za-z]{16}).*$ /confirm.cgi?type=update;token=$1 RewriteRule ^/[Pp]/([0-9A-Za-z]{16}).*$ /confirm.cgi?type=problem;token=$1 RewriteRule ^/[Qq]/([0-9A-Za-z]{16}).*$ /questionnaire.cgi?token=$1 +RewriteRule ^/[Ff]/([0-9A-Za-z]{16}).*$ /flickr.cgi?token=$1 +RewriteRule ^/[Ll]/([0-9A-Za-z]{16}).*$ /flickr2.cgi?token=$1 RewriteRule ^/rss/([0-9]+)$ /rss.cgi?type=new_updates;id=$1 [QSA] RewriteRule ^/rss/([0-9]+),([0-9]+)$ /rss.cgi?type=local_problems;x=$1;y=$2 [QSA] |