aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/alert-tracks-debian.ugly2
-rw-r--r--config/custom-routes.rb1
-rw-r--r--config/environment.rb8
-rw-r--r--config/general.yml-example18
-rw-r--r--config/httpd.conf17
-rw-r--r--config/routes.rb23
6 files changed, 60 insertions, 9 deletions
diff --git a/config/alert-tracks-debian.ugly b/config/alert-tracks-debian.ugly
index 730a125b4..5bd146061 100644
--- a/config/alert-tracks-debian.ugly
+++ b/config/alert-tracks-debian.ugly
@@ -32,7 +32,7 @@ start_daemon() {
}
stop_daemon() {
- /sbin/start-stop-daemon --stop --pidfile "$PIDFILE"
+ /sbin/start-stop-daemon --stop --oknodo --pidfile "$PIDFILE"
}
restart() { stop; start; }
diff --git a/config/custom-routes.rb b/config/custom-routes.rb
new file mode 100644
index 000000000..16b3c6b0c
--- /dev/null
+++ b/config/custom-routes.rb
@@ -0,0 +1 @@
+# Placeholder to be overriden by themes if necessary \ No newline at end of file
diff --git a/config/environment.rb b/config/environment.rb
index 6bd40cab4..0af465049 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -61,7 +61,7 @@ Rails::Initializer.run do |config|
config.gem "gettext", :version => '>=1.9.3'
config.gem "fast_gettext", :version => '>=0.4.8'
config.gem "rack", :version => '1.1.0'
- config.gem "rdoc", :version => '2.4.3'
+ config.gem "rdoc", :version => '>=2.4.3'
config.gem "recaptcha", :lib => "recaptcha/rails"
config.gem 'rspec', :lib => false, :version => '1.3.1'
config.gem 'rspec-rails', :lib => false, :version => '1.3.3'
@@ -110,7 +110,7 @@ ActionMailer::Base.default_url_options[:host] = MySociety::Config.get("DOMAIN",
# So that javascript assets use full URL, so proxied admin URLs read javascript OK
if (MySociety::Config.get("DOMAIN", "") != "")
ActionController::Base.asset_host = Proc.new { |source, request|
- if request.fullpath.match(/^\/admin\//)
+ if ENV["RAILS_ENV"] != "test" && request.fullpath.match(/^\/admin\//)
MySociety::Config.get("ADMIN_PUBLIC_URL", "")
else
MySociety::Config.get("DOMAIN", 'localhost:3000')
@@ -130,7 +130,7 @@ end
FastGettext.default_available_locales = available_locales
I18n.locale = default_locale
-I18n.available_locales = available_locales
+I18n.available_locales = available_locales.map {|locale_name| locale_name.to_sym}
I18n.default_locale = default_locale
# Load monkey patches and other things from lib/
@@ -145,3 +145,5 @@ require 'sendmail_return_path.rb'
require 'tnef.rb'
require 'i18n_fixes.rb'
require 'rack_quote_monkeypatch.rb'
+require 'world_foi_websites.rb'
+require 'alaveteli_external_command.rb'
diff --git a/config/general.yml-example b/config/general.yml-example
index 48e8523ef..8c59b1b0e 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -37,6 +37,9 @@ FRONTPAGE_PUBLICBODY_EXAMPLES: 'tgq'
# URL of theme to install (when running rails-post-deploy script)
THEME_URL: 'git://github.com/mysociety/whatdotheyknow-theme.git'
+# Whether a user needs to sign in to start the New Request process
+FORCE_REGISTRATION_ON_NEW_REQUEST: false
+
## Incoming email
# Your email domain, e.g. 'foifa.com'
@@ -61,6 +64,10 @@ ADMIN_PASSWORD: 'passwordx'
CONTACT_EMAIL: 'postmaster@localhost'
CONTACT_NAME: 'Alaveteli Webmaster'
+# Email "from" details for track messages
+TRACK_SENDER_EMAIL: 'postmaster@localhost'
+TRACK_SENDER_NAME: 'Alaveteli Webmaster'
+
# Where the raw incoming email data gets stored; make sure you back
# this up!
RAW_EMAILS_LOCATION: 'files/raw_emails'
@@ -112,3 +119,14 @@ USE_GHOSTSCRIPT_COMPRESSION: true
# mySociety's gazeteer service. Shouldn't change.
GAZE_URL: http://gaze.mysociety.org
+
+# The email address to which non-bounce responses should be forwarded
+FORWARD_NONBOUNCE_RESPONSES_TO: user-support@localhost
+
+# 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
+# If the command is not present, a text-only version will be rendered
+# instead.
+HTML_TO_PDF_COMMAND: /usr/local/bin/wkhtmltopdf-amd64 \ No newline at end of file
diff --git a/config/httpd.conf b/config/httpd.conf
index d5e86478a..47e7f9c72 100644
--- a/config/httpd.conf
+++ b/config/httpd.conf
@@ -35,4 +35,19 @@ RewriteRule /files/(.+) http://files.whatdotheyknow.com/$1
<IfModule mod_passenger.c>
# Set this to something like 100 if you have memory leak issues
PassengerMaxRequests 0
-</IfModule> \ No newline at end of file
+ PassengerResolveSymlinksInDocumentRoot on
+ # Recommend setting this to 3 or less on servers with 512MB RAM
+ PassengerMaxPoolSize 6
+</IfModule>
+
+# Gzip font resources
+<IfModule mod_deflate.c>
+ <IfModule mod_mime.c>
+ Addtype font/opentype .otf
+ Addtype font/opentype .woff
+ Addtype font/eot .eot
+ Addtype font/truetype .ttf
+ </IfModule>
+ AddOutputFilterByType DEFLATE font/opentype font/truetype font/eot
+ AddOutputFilterByType DEFLATE image/svg+xml
+</IFModule>
diff --git a/config/routes.rb b/config/routes.rb
index c067de4e5..48bf92e75 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,12 +7,15 @@
# $Id: routes.rb,v 1.92 2009-10-14 22:01:27 francis Exp $
ActionController::Routing::Routes.draw do |map|
-
+
# The priority is based upon order of creation: first created -> highest priority.
# Sample of regular route:
# map.connect 'products/:id', :controller => 'catalog', :action => 'view'
# Keep in mind you can assign values other than :controller and :action
+
+ # Allow easy extension from themes. Note these will have the highest priority.
+ require 'config/custom-routes'
map.with_options :controller => 'general' do |general|
general.frontpage '/', :action => 'frontpage'
@@ -23,7 +26,7 @@ ActionController::Routing::Routes.draw do |map|
# Couldn't find a way to do this in routes which also picked up multiple other slashes
# and dots and other characters that can appear in search query. So we sort it all
# out in the controller.
- general.search_general '/search/*combined/all', :action => 'search', :view => 'all'
+ general.search_general '/search/*combined/requests', :action => 'search', :view => 'requests'
general.search_general '/search/*combined', :action => 'search'
general.advanced_search '/advancedsearch', :action => 'search_redirect', :advanced => true
@@ -40,9 +43,13 @@ ActionController::Routing::Routes.draw do |map|
request.request_list_awaiting '/list/awaiting', :action => 'list', :view => 'awaiting'
request.request_list '/list', :action => 'list'
+ request.select_authority '/select_authority', :action => 'select_authority'
+
request.new_request '/new', :action => 'new'
request.new_request_to_body '/new/:url_name', :action => 'new'
+ request.search_ahead '/request/search_ahead', :action => 'search_typeahead'
+
request.show_request '/request/:url_title.:format', :action => 'show'
request.show_new_request '/request/:url_title/new', :action => 'show'
request.details_request '/details/request/:url_title', :action => 'details'
@@ -57,6 +64,7 @@ ActionController::Routing::Routes.draw do |map|
request.info_request_event '/request_event/:info_request_event_id', :action => 'show_request_event'
request.upload_response "/upload/request/:url_title", :action => 'upload_response'
+ request.download_entire_request '/request/:url_title/download', :action => 'download_entire_request'
end
@@ -85,6 +93,7 @@ ActionController::Routing::Routes.draw do |map|
end
map.with_options :controller => 'public_body' do |body|
+ body.search_ahead_bodies '/body/search_ahead', :action => 'search_typeahead'
body.list_public_bodies "/body", :action => 'list'
body.list_public_bodies_default "/body/list/all", :action => 'list'
body.list_public_bodies "/body/list/:tag", :action => 'list'
@@ -95,16 +104,19 @@ ActionController::Routing::Routes.draw do |map|
body.show_public_body_successful "/body/:url_name/successful", :action => 'show', :view => "successful"
body.show_public_body_unsuccessful "/body/:url_name/unsuccessful", :action => 'show', :view => "unsuccessful"
body.show_public_body_awaiting "/body/:url_name/awaiting", :action => 'show', :view => "awaiting"
+ body.view_public_body_email "/body/:url_name/view_email", :action => 'view_email'
body.show_public_body_tag "/body/:url_name/:tag", :action => 'show'
body.show_public_body_tag_view "/body/:url_name/:tag/:view", :action => 'show'
-
- body.view_public_body_email "/body/:url_name/view_email", :action => 'view_email'
end
map.with_options :controller => 'comment' do |comment|
comment.new_comment "/annotate/request/:url_title", :action => 'new', :type => 'request'
end
+ map.with_options :controller => 'services' do |service|
+ service.other_country_message "/country_message", :action => 'other_country_message'
+ end
+
map.with_options :controller => 'track' do |track|
# /track/ is for setting up an email alert for the item
# /feed/ is a direct RSS feed of the item
@@ -124,6 +136,7 @@ ActionController::Routing::Routes.draw do |map|
map.with_options :controller => 'help' do |help|
help.help_unhappy '/help/unhappy/:url_title', :action => 'unhappy'
help.help_about '/help/about', :action => 'about'
+ help.help_alaveteli '/help/alaveteli', :action => 'alaveteli'
help.help_contact '/help/contact', :action => 'contact'
help.help_officers '/help/officers', :action => 'officers'
help.help_requesting '/help/requesting', :action => 'requesting'
@@ -192,7 +205,9 @@ ActionController::Routing::Routes.draw do |map|
user.admin_user_list_banned '/admin/user/banned', :action => 'list_banned'
user.admin_user_show '/admin/user/show/:id', :action => 'show'
user.admin_user_edit '/admin/user/edit/:id', :action => 'edit'
+ user.admin_user_show '/admin/user/show_bounce_message/:id', :action => 'show_bounce_message'
user.admin_user_update '/admin/user/update/:id', :action => 'update'
+ user.admin_user_clear_bounce '/admin/user/clear_bounce/:id', :action => 'clear_bounce'
user.admin_user_destroy_track '/admin/user/destroy_track', :action => 'destroy_track'
user.admin_user_login_as '/admin/user/login_as/:id', :action => 'login_as'
user.admin_clear_profile_photo '/admin/user/clear_profile_photo/:id', :action => 'clear_profile_photo'
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-23 13:10:03 +0000