diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/environment.rb | 19 | ||||
| -rw-r--r-- | config/general.yml-example | 4 | ||||
| -rw-r--r-- | config/httpd.conf | 3 | ||||
| -rw-r--r-- | config/test.yml | 8 |
4 files changed, 19 insertions, 15 deletions
diff --git a/config/environment.rb b/config/environment.rb index b958c6475..f788845a9 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,7 +1,7 @@ # Be sure to restart your web server when you modify this file. -# Uncomment below to force Rails into production mode when +# Uncomment below to force Rails into production mode when # you don't control web/app server and can't set it the proper way # ENV['RAILS_ENV'] ||= 'production' @@ -31,9 +31,12 @@ load "util.rb" require File.join(File.dirname(__FILE__), '../lib/old_rubygems_patch') +# Application version +ALAVETELI_VERSION = '0.6.5' + Rails::Initializer.run do |config| # Load intial mySociety config - if ENV["RAILS_ENV"] == "test" + if ENV["RAILS_ENV"] == "test" MySociety::Config.set_file(File.join(config.root_path, 'config', 'test'), true) else MySociety::Config.set_file(File.join(config.root_path, 'config', 'general'), true) @@ -41,7 +44,7 @@ Rails::Initializer.run do |config| MySociety::Config.load_default # Settings in config/environments/* take precedence over those specified here - + # Skip frameworks you're not going to use (only works if using vendor/rails) # config.frameworks -= [ :action_web_service, :action_mailer ] @@ -51,7 +54,7 @@ Rails::Initializer.run do |config| # Add additional load paths for your own custom dirs # config.load_paths += %W( #{Rails.root}/extras ) - # Force all environments to use the same logger level + # Force all environments to use the same logger level # (by default production uses :info, the others :debug) # TEMP: uncomment this to turn on logging in production environments # config.log_level = :debug @@ -60,7 +63,7 @@ Rails::Initializer.run do |config| #GettextI18nRails.translations_are_html_safe = true # Use SQL instead of Active Record's schema dumper when creating the test database. - # This is necessary if your schema can't be completely dumped by the schema dumper, + # This is necessary if your schema can't be completely dumped by the schema dumper, # like if you have constraints or database-specific column types config.active_record.schema_format = :sql @@ -69,8 +72,8 @@ Rails::Initializer.run do |config| # Make Active Record use UTC-base instead of local time config.active_record.default_timezone = :utc - - config.after_initialize do + + config.after_initialize do require 'routing_filters.rb' end @@ -79,7 +82,7 @@ Rails::Initializer.run do |config| ENV['RECAPTCHA_PRIVATE_KEY'] = MySociety::Config::get("RECAPTCHA_PRIVATE_KEY", 'x'); end -# Add new inflection rules using the following format +# Add new inflection rules using the following format # (all these examples are active by default): # Inflector.inflections do |inflect| # inflect.plural /^(ox)$/i, '\1en' diff --git a/config/general.yml-example b/config/general.yml-example index 33e3ad5bf..a6f657d96 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -38,8 +38,8 @@ FRONTPAGE_PUBLICBODY_EXAMPLES: 'tgq' # script). Earlier in the list means the templates have a higher # priority. THEME_URLS: - - 'git://github.com/sebbacon/adminbootstraptheme.git' - - 'git://github.com/sebbacon/alavetelitheme.git' + - 'git://github.com/mysociety/adminbootstraptheme.git' + - 'git://github.com/mysociety/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/httpd.conf b/config/httpd.conf index 36f567964..129b1577b 100644 --- a/config/httpd.conf +++ b/config/httpd.conf @@ -43,7 +43,8 @@ RewriteRule /files/(.+) http://files.whatdotheyknow.com/$1 # file exists. RewriteMap escape int:escape RewriteCond %{DOCUMENT_ROOT}/views_cache/request/$2/$1/${escape:$3} -f -RewriteRule ^/request/((\d{1,3})\d*)/(response/\d+/attach/\d+/.+) /views_cache/request/$2/$1/${escape:$3} [L] +RewriteRule ^/request/((\d{1,3})\d*)/(response/\d+/attach/(html/)?\d+/.+) /views_cache/request/$2/$1/${escape:$3} [L] + <IfModule mod_passenger.c> # Set this to something like 100 if you have memory leak issues diff --git a/config/test.yml b/config/test.yml index 6e34340ff..5811b1785 100644 --- a/config/test.yml +++ b/config/test.yml @@ -1,7 +1,7 @@ # test.yml # Test values for the "general" config file. # -# Configuration parameters, in YAML syntax. +# Configuration parameters, in YAML syntax. # # These may be values expected by the test suite; changing them may # break tests. @@ -12,7 +12,7 @@ SITE_NAME: 'Alaveteli' # Domain used in URLs generated by scripts (e.g. for going in some emails) # It makes things simpler if this is the same as the Rails test domain test.host DOMAIN: 'test.host' - + # ISO country code of country currrently deployed in # (http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) ISO_COUNTRY_CODE: DE @@ -34,14 +34,14 @@ 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. +# 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' +THEME_URL: 'git://github.com/mysociety/alavetelitheme.git' ## Incoming email |