diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/crontab.ugly | 1 | ||||
| -rw-r--r-- | conf/general-example | 2 | ||||
| -rw-r--r-- | conf/httpd.conf | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/conf/crontab.ugly b/conf/crontab.ugly index 48a46da9c..3b0077fb3 100644 --- a/conf/crontab.ugly +++ b/conf/crontab.ugly @@ -27,7 +27,6 @@ MAILTO=cron-!!(*= $site *)!!@mysociety.org 5,10,15,20,25,30,35,40,45,50,55 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/send-reports || echo "stalled?" 0 0-8,10,11,13,14,16,17,19-23 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/send-reports || echo "stalled?" 0 9,12,15,18 * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-reports.lock "/data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/send-reports --verbose" || echo "stalled?" -15,45 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/import-flickr.lock /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/import-flickr || echo "stalled?" 2 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-alerts.lock /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/send-alerts || echo "stalled?" 0,30 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/send-questionnaires.lock /data/vhost/!!(*= $vhost *)!!/fixmystreet/bin/send-questionnaires || echo "stalled?" diff --git a/conf/general-example b/conf/general-example index 510557e46..a61f2b0b9 100644 --- a/conf/general-example +++ b/conf/general-example @@ -64,8 +64,6 @@ define('OPTION_HEARFROMYOURMP_BASE_URL', ''); define('OPTION_SMTP_SMARTHOST', 'localhost'); -define('OPTION_FLICKR_API', ''); - define('OPTION_IPHONE_URL', ''); // Log file (used in test harness, and later in admin scripts) diff --git a/conf/httpd.conf b/conf/httpd.conf index ab35e29cf..78bb6b598 100644 --- a/conf/httpd.conf +++ b/conf/httpd.conf @@ -52,7 +52,6 @@ RewriteRule ^(.+)/$ $1 [R=permanent] # RewriteRule ^/[Aa]/([0-9A-Za-z]{16,18}).*$ /alert.cgi?token=$1 [QSA,L] # RewriteRule ^/[Cc]/([0-9A-Za-z]{16,18}).*$ /confirm.cgi?type=update;token=$1 [QSA,L] # RewriteRule ^/[Qq]/([0-9A-Za-z]{16,18}).*$ /questionnaire.cgi?token=$1 [QSA,L] -RewriteRule ^/[Ff]/([0-9A-Za-z]{16,18}).*$ /flickr.cgi?token=$1 [L] # RSS feeds for updates on a problem #RewriteRule ^/rss/([0-9]+)$ /rss.cgi?type=new_updates;id=$1 [QSA,L] @@ -101,7 +100,6 @@ RewriteRule /(.+) /$1 [L] # Explicitly capture all cgi files so that we can remove them one by one # RewriteRule ^/confirm(.*) /confirm.cgi$1 [L] -RewriteRule ^/flickr(.*) /flickr.cgi$1 [L] # RewriteRule ^/questionnaire(.*) /questionnaire.cgi$1 [L] # RewriteRule ^/reports(.*) /reports.cgi$1 [L] # RewriteRule ^/rss(.*) /rss.cgi$1 [L] |