diff options
| author | David Cabo <david@calibea.com> | 2011-10-13 00:31:56 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-10-13 00:31:56 +0200 |
| commit | 6b19c36f114624d7e53be8edc9ee490ecd20d0b0 (patch) | |
| tree | 7741c3655fe5e3cbc90dd20a4626ac7acc1bf6b0 /config | |
| parent | 6800b9ff3fc77aa441afbdb0b0196afbdd87d8b4 (diff) | |
| parent | e13127a8ebc8bf8379d92f778af5a2bb6931d80c (diff) | |
Merge branch 'release/0.4' into develop
Diffstat (limited to 'config')
| -rw-r--r-- | config/environment.rb | 2 | ||||
| -rw-r--r-- | config/httpd.conf | 16 | ||||
| -rw-r--r-- | config/routes.rb | 5 |
3 files changed, 18 insertions, 5 deletions
diff --git a/config/environment.rb b/config/environment.rb index daeefb615..0af465049 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -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/ diff --git a/config/httpd.conf b/config/httpd.conf index 108402f69..47e7f9c72 100644 --- a/config/httpd.conf +++ b/config/httpd.conf @@ -36,4 +36,18 @@ RewriteRule /files/(.+) http://files.whatdotheyknow.com/$1 # Set this to something like 100 if you have memory leak issues PassengerMaxRequests 0 PassengerResolveSymlinksInDocumentRoot on -</IfModule>
\ No newline at end of file + # 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 3dfa30d5a..48bf92e75 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -104,10 +104,9 @@ 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| @@ -137,7 +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_about '/help/alaveteli', :action => 'alaveteli' + 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' |