diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/crontab.ugly | 2 | ||||
| -rw-r--r-- | config/general.yml | 118 | ||||
| -rw-r--r-- | config/general.yml-example | 2 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
4 files changed, 4 insertions, 120 deletions
diff --git a/config/crontab.ugly b/config/crontab.ugly index 5f2fbdb3b..43b191fd4 100644 --- a/config/crontab.ugly +++ b/config/crontab.ugly @@ -10,7 +10,7 @@ PATH=/usr/local/bin:/usr/bin:/bin MAILTO=cron-!!(*= $site *)!!@mysociety.org # Every 5 minutes -*/5 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/update-xapian-index.lock /data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/update-xapian-index || echo "stalled?" +*/5 * * * * !!(*= $user *)!! run-with-lockfile -n /data/vhost/!!(*= $vhost *)!!/update-xapian-index.lock "/data/vhost/!!(*= $vhost *)!!/!!(*= $vcspath *)!!/script/update-xapian-index verbose=true" >> /data/vhost/!!(*= $vhost *)!!/logs/update-xapian-index.log || echo "stalled?" # Every 10 minutes 5,15,25,35,45,55 * * * * !!(*= $user *)!! /etc/init.d/foi-alert-tracks check diff --git a/config/general.yml b/config/general.yml deleted file mode 100644 index 7c70f8e71..000000000 --- a/config/general.yml +++ /dev/null @@ -1,118 +0,0 @@ -# general.yml-example: -# Example values for the "general" config file. -# -# Configuration parameters, in YAML syntax. -# -# Copy this file to one called "general.yml" in the same directory. Or -# have multiple config files and use a symlink to change between them. - -# Site name appears in various places throughout the site -SITE_NAME: 'Alaveteli' - -# Domain used in URLs generated by scripts (e.g. for going in some emails) -DOMAIN: 'localhost:3000' - -# ISO country code of country currrently deployed in -# (http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) -ISO_COUNTRY_CODE: DE - -# These feeds are displayed accordingly on the Alaveteli "blog" page: -BLOG_FEED: 'http://www.mysociety.org/category/projects/whatdotheyknow/feed/' -TWITTER_USERNAME: 'alaveteli_foi' - -# Locales we wish to support in this app, space-delimited -AVAILABLE_LOCALES: 'en' -DEFAULT_LOCALE: 'en' - -# if 'true', respect the user's choice of language in the browser -USE_DEFAULT_BROWSER_LANGUAGE: true - -# How many days should have passed before an answer to a request is officially late? -REPLY_LATE_AFTER_DAYS: 20 -REPLY_VERY_LATE_AFTER_DAYS: 40 -# We give some types of authority like schools a bit longer than everyone else -SPECIAL_REPLY_VERY_LATE_AFTER_DAYS: 60 - -# example searches for the home page, semicolon delimited. -FRONTPAGE_SEARCH_EXAMPLES: 'Geraldine Quango; Department for Humpadinking' - -# example public bodies for the home page, semicolon delimited - short_names -FRONTPAGE_PUBLICBODY_EXAMPLES: 'tgq' - -# URL of theme to install (when running rails-post-deploy script) -THEME_URL: 'git://github.com/sebbacon/alavetelitheme.git' - - -## Incoming email -# Your email domain, e.g. 'foifa.com' -INCOMING_EMAIL_DOMAIN: 'localhost' - -# An optional prefix to help you distinguish FOI requests, e.g. 'foi+' -INCOMING_EMAIL_PREFIX: '' - -# used for hash in request email address -INCOMING_EMAIL_SECRET: 'xxxx xxxx xxxx xxxx xxxx xxxx xxxx xxxx' - -# used as envelope from at the incoming email domain for cases where we don't care about failure -BLACKHOLE_PREFIX: 'do-not-reply-to-this-address' - -## Administration - -# Leave these two blank to skip admin authorisation -ADMIN_USERNAME: 'asd' -ADMIN_PASSWORD: 'qwe' - -# Email "from" details -CONTACT_EMAIL: 'postmaster@localhost' -CONTACT_NAME: 'Alaveteli Webmaster' - -# Where the raw incoming email data gets stored; make sure you back -# this up! -RAW_EMAILS_LOCATION: 'files/raw_emails' - -# The base URL for admin pages. You probably don't want to change this. -ADMIN_BASE_URL: '/admin/' - -# Where /stylesheets sits under for admin pages. See asset_host in -# config/environment.rb. Can be full domain or relative path (not an -# absolute path beginning with /). Again, unlikely to want to change -# this. -ADMIN_PUBLIC_URL: '' - -# Secret key for signing cookie_store sessions -COOKIE_STORE_SESSION_SECRET: 'your secret key here, make it long and random' - -# If present, puts the site in read only mode, and uses the text as reason -# (whole paragraph). Please use a read-only database user as well, as it only -# checks in a few obvious places. -READ_ONLY: '' - -# Doesn't do anything right now. -STAGING_SITE: 1 - -# Recaptcha, for detecting humans. Get keys here: http://recaptcha.net/whyrecaptcha.html -RECAPTCHA_PUBLIC_KEY: '6LcsnMcSAAAAAAL4FqMix7IOsEIwdMh42MuOFztv' -RECAPTCHA_PRIVATE_KEY: '6LcsnMcSAAAAAFjbWcf2dI874as0fmYSAiC9Jgvx' - -# For debugging memory problems. If true, the app logs -# the memory use increase of the Ruby process due to the -# request (Linux only). Since Ruby never returns memory to the OS, if the -# existing process previously served a larger request, this won't -# show any consumption for the later request. -DEBUG_RECORD_MEMORY: false - -# If you have Alaveteli set up behind an HTTP caching proxy -# (accelerator) like Varnish or Squid, you can cause the application -# to purge selected URLs by setting these two variables (see -# `../doc/CACHING.md` for details) -ACCELERATOR_HOST: 'localhost' -ACCELERATOR_PORT: '6081' - -# mySociety's gazeteer service. Shouldn't change. -GAZE_URL: http://gaze.mysociety.org - -# Path to a program that converts a page at a URL to HTML. It should -# take two arguments: the URL, and a path to an output file. A static -# binary of wkhtmltopdf is recommended: -# http://code.google.com/p/wkhtmltopdf/downloads/list -HTML_TO_PDF_COMMAND: /usr/local/bin/wkhtmltopdf-amd64
\ No newline at end of file diff --git a/config/general.yml-example b/config/general.yml-example index 8c59b1b0e..ec4529b2b 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -35,7 +35,7 @@ SPECIAL_REPLY_VERY_LATE_AFTER_DAYS: 60 FRONTPAGE_PUBLICBODY_EXAMPLES: 'tgq' # URL of theme to install (when running rails-post-deploy script) -THEME_URL: 'git://github.com/mysociety/whatdotheyknow-theme.git' +THEME_URL: 'git://github.com/sebbacon/alavetelitheme.git' # Whether a user needs to sign in to start the New Request process FORCE_REGISTRATION_ON_NEW_REQUEST: false diff --git a/config/routes.rb b/config/routes.rb index 511b5fc1e..39c6ba70f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -78,6 +78,8 @@ ActionController::Routing::Routes.draw do |map| user.confirm '/c/:email_token', :action => 'confirm' user.show_user '/user/:url_name.:format', :action => 'show' + user.show_user_profile '/user/:url_name/profile.:format', :action => 'show', :view => 'profile' + user.show_user_requests '/user/:url_name/requests.:format', :action => 'show', :view => 'requests' user.contact_user '/user/contact/:id', :action => 'contact' user.signchangepassword '/profile/change_password', :action => 'signchangepassword' |