Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

* remove unneeded config and change the max, min and timeout settings…

… for passenger
  • Loading branch information...
commit 4a07f370f1217157708367974228d1bf6cc29346 1 parent 5437855
Ali Jelveh authored March 02, 2012
6  apache2/passenger_vhost.conf.erb
... ...
@@ -1,5 +1,5 @@
1  
-PassengerMaxPoolSize 2
2  
-PassengerPoolIdleTime 0
  1
+PassengerMinInstances 2
  2
+PassengerMaxPoolSize 10
3 3
 PassengerUseGlobalQueue on
4 4
 
5 5
 <VirtualHost *:80>
@@ -13,7 +13,7 @@ PassengerUseGlobalQueue on
13 13
   ProxyRequests On
14 14
   AllowCONNECT  22
15 15
   
16  
-  <Proxy http://127.0.0.1:8124 >
  16
+  <Proxy http://127.0.0.1:8124>
17 17
     AddDefaultCharset off
18 18
     Order deny,allow
19 19
     Allow from all
69  apache2/passenger_vhost.conf.erb.original
... ...
@@ -1,69 +0,0 @@
1  
-# Copyright (c) 2010 Tricycle I.T. Pty Ltd
2  
-#
3  
-# Permission is hereby granted, free of charge, to any person obtaining a copy
4  
-# of this software and associated documentation files (the "Software"), to deal
5  
-# in the Software without restriction, including without limitation the rights
6  
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7  
-# copies of the Software, and to permit persons to whom the Software is
8  
-# furnished to do so, subject to the following conditions:
9  
-#
10  
-# The above copyright notice and this permission notice shall be included in
11  
-# all copies or substantial portions of the Software.
12  
-#
13  
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14  
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15  
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16  
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17  
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18  
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19  
-# THE SOFTWARE.
20  
-#
21  
-# (from http://www.opensource.org/licenses/mit-license.php)
22  
-
23  
-<VirtualHost *:<%= var(:port, :default => (var(:certificate, :default => '').blank? ? 80 : 443)) %>>
24  
-  <% unless var(:certificate).blank? %>
25  
-    SSLEngine On
26  
-    SSLCertificateFile /etc/apache2/ssl/<%= var(:certificate) %>.crt
27  
-    SSLCertificateKeyFile /etc/apache2/ssl/<%= var(:certificate) %>.key
28  
-
29  
-    # enable only secure protocols: SSLv3 and TLSv1, but not SSLv2
30  
-    SSLProtocol all -SSLv2
31  
-  <% end %>
32  
-
33  
-  ServerAdmin <%= var(:server_admin, :default => 'webmaster@tricycledevelopments.com') %>
34  
-
35  
-  ServerName <%= var(:canonical_host) %>
36  
-  <% var(:aliases).each do |host| %>
37  
-    ServerAlias <%= host %>
38  
-  <% end %>
39  
-
40  
-  DocumentRoot <%= var(:app_root) / 'current/public' %>
41  
-
42  
-  ErrorLog <%= var(:app_root) / 'shared/log/error.log' %>
43  
-  CustomLog <%= var(:app_root) / 'shared/log/access.log' %> common
44  
-
45  
-  RewriteEngine on
46  
-  RewriteLog <%= var(:app_root) / 'shared/log/rewrite.log' %>
47  
-  RewriteLogLevel 2
48  
-
49  
-  # Important rules to prevent exposure of SCM files if you are deploying with Capistrano !
50  
-  RewriteRule ^(.*/)?.svn/ - [forbidden,last]
51  
-  RewriteRule ^(.*/)?.git/ - [forbidden,last]
52  
-
53  
-  <%= var(:extra, :default => '') %>
54  
-
55  
-  # Redirect non main sites, to main site
56  
-  RewriteCond %{HTTP_HOST}  !^(<%= ([var(:canonical_host)] + var(:aliases_without_redirect)).join("|").gsub(/\./, '\.') %>) [NC]
57  
-  RewriteCond %{HTTP_HOST}  !^$
58  
-  RewriteRule ^/?(.*)       <%= (var(:certificate).blank? ? "https" : "http") %>://<%= var(:canonical_host) %>/$1 [L,R=301,NE]
59  
-
60  
-  # Check for maintenance file and redirect all requests
61  
-  RewriteCond <%= var(:app_root) / 'shared/system/maintenance.trigger' %> -f
62  
-  RewriteCond %{SCRIPT_FILENAME} !(maintenance.html|css|jpe?g|png|gif)
63  
-  RewriteRule ^.*$ /maintenance.html [redirect=503,last]
64  
-
65  
-  ErrorDocument 503 /maintenance.html
66  
-  ErrorDocument 500 /500.html
67  
-
68  
-  RailsEnv <%= var(:rails_environment, :default => 'production') %>
69  
-</VirtualHost>

0 notes on commit 4a07f37

Please sign in to comment.
Something went wrong with that request. Please try again.