diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-09 21:33:02 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-09 21:33:02 +0000 |
| commit | bb87d842ec3559483a2c0132dbc0c216e0cb597e (patch) | |
| tree | 29aa4b04135da7341f4b512ceaef2664877da1ab | |
| parent | 6c22c60b16f5653920ff894ca6732f539e4139a9 (diff) | |
| parent | 38e30c682504e8cd5ace61f2fc937d100eae3c65 (diff) | |
Merge branch 'wdtk' into release/0.5
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | config/general.yml-example | 3 | ||||
| -rw-r--r-- | config/httpd.conf | 2 | ||||
| -rw-r--r-- | config/packages | 1 |
4 files changed, 6 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index ab1f3004f..e1f12f68c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,12 +10,10 @@ .DS_Store .autotest /db/test_structure.sql -moo.txt *#*# TAGS /vendor/plugins/*theme /locale/model_attributes.rb /files/ -public/download -general.yml - +/public/download +/public/*theme 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 |