diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/.gitignore | 1 | ||||
| -rw-r--r-- | config/alert-tracks-debian.ugly | 6 | ||||
| -rw-r--r-- | config/crontab-example (renamed from config/crontab.ugly) | 6 | ||||
| -rw-r--r-- | config/deploy.rb | 1 | ||||
| -rw-r--r-- | config/general.yml-example | 5 | ||||
| -rw-r--r-- | config/initializers/alaveteli.rb | 2 | ||||
| -rw-r--r-- | config/packages | 1 | ||||
| -rw-r--r-- | config/packages_development | 9 | ||||
| -rw-r--r-- | config/purge-varnish-debian.ugly | 6 | ||||
| -rw-r--r-- | config/routes.rb | 15 |
10 files changed, 31 insertions, 21 deletions
diff --git a/config/.gitignore b/config/.gitignore index 5ad2de008..fbe4a97d3 100644 --- a/config/.gitignore +++ b/config/.gitignore @@ -8,3 +8,4 @@ memcached.yml *.deployed deploy.yml newrelic.yml +crontab diff --git a/config/alert-tracks-debian.ugly b/config/alert-tracks-debian.ugly index 2b52ad840..29a350a0e 100644 --- a/config/alert-tracks-debian.ugly +++ b/config/alert-tracks-debian.ugly @@ -1,13 +1,13 @@ #!/bin/bash # ### BEGIN INIT INFO -# Provides: alert-tracks +# Provides: !!(*= $daemon_name *)!! # Required-Start: $local_fs $syslog # Required-Stop: $local_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: alert-tracks is a daemon running the Alaveteli email alerts -# Description: alert-tracks send Alaveteli email alerts as required +# Short-Description: !!(*= $daemon_name *)!! is a daemon running the Alaveteli email alerts +# Description: !!(*= $daemon_name *)!! sends Alaveteli email alerts as required ### END INIT INFO # # !!(*= $daemon_name *)!! Start the Alaveteli email alert daemon diff --git a/config/crontab.ugly b/config/crontab-example index d33450df4..32baff170 100644 --- a/config/crontab.ugly +++ b/config/crontab-example @@ -1,7 +1,7 @@ -# crontab.ugly: -# Timed tasks for FOI site. Template file. +# crontab-example: +# Timed tasks for Alaveteli site. Template file. # -# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. +# Copyright (c) 2013 UK Citizens Online Democracy. All rights reserved. # Email: hello@mysociety.org. WWW: http://www.mysociety.org/ PATH=/usr/local/bin:/usr/bin:/bin diff --git a/config/deploy.rb b/config/deploy.rb index 5e660434a..3ce1a1969 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -50,6 +50,7 @@ namespace :deploy do "#{release_path}/config/general.yml" => "#{shared_path}/general.yml", "#{release_path}/config/rails_env.rb" => "#{shared_path}/rails_env.rb", "#{release_path}/config/newrelic.yml" => "#{shared_path}/newrelic.yml", + "#{release_path}/config/httpd.conf" => "#{shared_path}/httpd.conf", "#{release_path}/config/aliases" => "#{shared_path}/aliases", "#{release_path}/public/foi-live-creation.png" => "#{shared_path}/foi-live-creation.png", "#{release_path}/public/foi-user-use.png" => "#{shared_path}/foi-user-use.png", diff --git a/config/general.yml-example b/config/general.yml-example index 17e1aa552..0753af46b 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -187,3 +187,8 @@ MTA_LOG_PATH: '/var/log/exim4/exim-mainlog-*' # Whether we are using "exim" or "postfix" for our MTA MTA_LOG_TYPE: "exim" + +# URL where people can donate to the organisation running the site. If set, +# this will be included in the message people see when their request is +# successful. +DONATION_URL: "http://www.mysociety.org/donate/" diff --git a/config/initializers/alaveteli.rb b/config/initializers/alaveteli.rb index 22ea238b7..d78bc3925 100644 --- a/config/initializers/alaveteli.rb +++ b/config/initializers/alaveteli.rb @@ -10,7 +10,7 @@ load "debug_helpers.rb" load "util.rb" # Application version -ALAVETELI_VERSION = '0.11' +ALAVETELI_VERSION = '0.12' # Add new inflection rules using the following format # (all these examples are active by default): diff --git a/config/packages b/config/packages index fc67cda6b..f4d0a674c 100644 --- a/config/packages +++ b/config/packages @@ -20,7 +20,6 @@ gnuplot-nox php5-cli sharutils unzip -wdg-html-validator mutt tnef (>= 1.4.5) gettext diff --git a/config/packages_development b/config/packages_development new file mode 100644 index 000000000..14ca815a2 --- /dev/null +++ b/config/packages_development @@ -0,0 +1,9 @@ +# This is a list of packages needed on a fresh Ubuntu installation for +# development. +# +# It assumes you're using RVM or a similar Ruby manager and have already +# run `bundle install`. +# +# To install, paste this list after `sudo apt-get install` and run. + +postgresql sharutils pdftk elinks php5-cli tnef python-yaml diff --git a/config/purge-varnish-debian.ugly b/config/purge-varnish-debian.ugly index af32650a8..04458ea78 100644 --- a/config/purge-varnish-debian.ugly +++ b/config/purge-varnish-debian.ugly @@ -1,13 +1,13 @@ #!/bin/bash # ### BEGIN INIT INFO -# Provides: purge-varnish +# Provides: !!(*= $daemon_name *)!! # Required-Start: $local_fs $syslog # Required-Stop: $local_fs $syslog # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: purge-varnish is a daemon purging the Alaveteli varnish cache -# Description: purge-varnish purge the Alaveteli varnish cache +# Short-Description: !!(*= $daemon_name *)!! is a daemon purging the Alaveteli varnish cache +# Description: !!(*= $daemon_name *)!! purges the Alaveteli varnish cache ### END INIT INFO # # !!(*= $daemon_name *)!! Start the Alaveteli email purge-varnish daemon diff --git a/config/routes.rb b/config/routes.rb index 1895543d7..5af94768c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -14,7 +14,6 @@ Alaveteli::Application.routes.draw do #### General contoller match '/' => 'general#frontpage', :as => :frontpage match '/blog' => 'general#blog', :as => :blog - match '/stylesheets/custom.css' => 'general#custom_css', :as => :custom_css match '/search' => 'general#search_redirect', :as => :search_redirect match '/search/all' => 'general#search_redirect', :as => :search_redirect # XXX combined is the search query, and then if sorted a "/newest" at the end. @@ -24,8 +23,7 @@ Alaveteli::Application.routes.draw do match '/search/*combined/all' => 'general#search', :as => :search_general, :view => 'all' match '/search(/*combined)' => 'general#search', :as => :search_general match '/advancedsearch' => 'general#search_redirect', :as => :advanced_search, :advanced => true - - match '/random' => 'general#random_request', :as => :random_request + match '/version.:format' => 'general#version', :as => :version ##### ##### Request controller @@ -59,15 +57,12 @@ Alaveteli::Application.routes.draw do match '/upload/request/:url_title' => 'request#upload_response', :as => :upload_response match '/request/:url_title/download' => 'request#download_entire_request', :as => :download_entire_request - - # It would be nice to add :conditions => { :method => :post } to this next one, - # because it ought not really to be available as a GET request since it changes - # the server state. Unfortunately this doesn’t play well with the PostRedirect - # mechanism, which assumes all post-login actions are available via GET, so we - # refrain. - match '/request/:url_title/report' => 'request#report_request', :as => :report #### + resources :request, :only => [] do + resource :report, :only => [:new, :create] + end + #### User controller # Use /profile for things to do with the currently signed in user. # Use /user/XXXX for things that anyone can see about that user. |