diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/environment.rb | 5 | ||||
| -rw-r--r-- | config/general.yml-example | 3 | ||||
| -rw-r--r-- | config/httpd.conf | 2 | ||||
| -rw-r--r-- | config/packages | 1 |
4 files changed, 8 insertions, 3 deletions
diff --git a/config/environment.rb b/config/environment.rb index d15ee9a0e..17ded987e 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -131,6 +131,9 @@ I18n.locale = default_locale I18n.available_locales = available_locales.map {|locale_name| locale_name.to_sym} I18n.default_locale = default_locale +# Customise will_paginate URL generation +WillPaginate::ViewHelpers.pagination_options[:renderer] = 'WillPaginateExtension::LinkRenderer' + # Load monkey patches and other things from lib/ require 'ruby19.rb' require 'tmail_extensions.rb' @@ -139,7 +142,7 @@ require 'timezone_fixes.rb' require 'use_spans_for_errors.rb' require 'make_html_4_compliant.rb' require 'activerecord_errors_extensions.rb' -require 'willpaginate_hack.rb' +require 'willpaginate_extension.rb' require 'sendmail_return_path.rb' require 'tnef.rb' require 'i18n_fixes.rb' diff --git a/config/general.yml-example b/config/general.yml-example index ec4529b2b..be39e5b3c 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -129,4 +129,5 @@ FORWARD_NONBOUNCE_RESPONSES_TO: user-support@localhost # 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 +HTML_TO_PDF_COMMAND: /usr/local/bin/wkhtmltopdf-amd64 + diff --git a/config/httpd.conf b/config/httpd.conf index 47e7f9c72..14197d8e4 100644 --- a/config/httpd.conf +++ b/config/httpd.conf @@ -34,7 +34,7 @@ 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 + PassengerMaxRequests 20 PassengerResolveSymlinksInDocumentRoot on # Recommend setting this to 3 or less on servers with 512MB RAM PassengerMaxPoolSize 6 diff --git a/config/packages b/config/packages index a42785824..76a5c29d6 100644 --- a/config/packages +++ b/config/packages @@ -41,3 +41,4 @@ rubygems libfcgi-dev gettext python-yaml +wkhtmltopdf-static |