aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore6
-rw-r--r--config/general.yml-example3
-rw-r--r--config/httpd.conf2
-rw-r--r--config/packages1
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