summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2009-07-23 09:15:02 +1000
committerJames Turnbull <james@lovedthanlost.net>2009-07-23 09:15:02 +1000
commit0c18013cb6bf9faff21bd049410e2baf1ef8aa90 (patch)
tree4d98d0fcd7c6bfdd3b87d26f4ec65961da5e8faa
parentc383ceb282d018b6d8ec348628353a2e3363da3b (diff)
downloadpuppet-0c18013cb6bf9faff21bd049410e2baf1ef8aa90.tar.gz
puppet-0c18013cb6bf9faff21bd049410e2baf1ef8aa90.tar.xz
puppet-0c18013cb6bf9faff21bd049410e2baf1ef8aa90.zip
Fixes #2430 - Stock apache2.conf for passenger incorrect
-rw-r--r--ext/rack/files/apache2.conf20
1 files changed, 11 insertions, 9 deletions
diff --git a/ext/rack/files/apache2.conf b/ext/rack/files/apache2.conf
index 88c0f052d..381327c9b 100644
--- a/ext/rack/files/apache2.conf
+++ b/ext/rack/files/apache2.conf
@@ -1,4 +1,15 @@
+
+# you probably want to tune these settings
+PassengerHighPerformance on
+PassengerMaxPoolSize 12
+PassengerPoolIdleTime 1500
+# PassengerMaxRequests 1000
+PassengerStatThrottleRate 120
+RackAutoDetect Off
+RailsAutoDetect Off
+
Listen 8140
+
<VirtualHost *:8140>
SSLEngine on
SSLProtocol -ALL +SSLv3 +TLSv1
@@ -15,15 +26,6 @@ Listen 8140
SSLVerifyDepth 1
SSLOptions +StdEnvVars
- # you probably want to tune these settings
- PassengerHighPerformance on
- PassengerMaxPoolSize 12
- PassengerPoolIdleTime 1500
- # PassengerMaxRequests 1000
- PassengerStatThrottleRate 120
- RackAutoDetect Off
- RailsAutoDetect Off
-
DocumentRoot /etc/puppet/rack/public/
RackBaseURI /
<Directory /etc/puppet/rack/>