Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

… for passenger
  • Loading branch information...
commit 4a07f370f1217157708367974228d1bf6cc29346 1 parent 5437855
@dudemeister authored
View
6 apache2/passenger_vhost.conf.erb
@@ -1,5 +1,5 @@
-PassengerMaxPoolSize 2
-PassengerPoolIdleTime 0
+PassengerMinInstances 2
+PassengerMaxPoolSize 10
PassengerUseGlobalQueue on
<VirtualHost *:80>
@@ -13,7 +13,7 @@ PassengerUseGlobalQueue on
ProxyRequests On
AllowCONNECT 22
- <Proxy http://127.0.0.1:8124 >
+ <Proxy http://127.0.0.1:8124>
AddDefaultCharset off
Order deny,allow
Allow from all
View
69 apache2/passenger_vhost.conf.erb.original
@@ -1,69 +0,0 @@
-# Copyright (c) 2010 Tricycle I.T. Pty Ltd
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# (from http://www.opensource.org/licenses/mit-license.php)
-
-<VirtualHost *:<%= var(:port, :default => (var(:certificate, :default => '').blank? ? 80 : 443)) %>>
- <% unless var(:certificate).blank? %>
- SSLEngine On
- SSLCertificateFile /etc/apache2/ssl/<%= var(:certificate) %>.crt
- SSLCertificateKeyFile /etc/apache2/ssl/<%= var(:certificate) %>.key
-
- # enable only secure protocols: SSLv3 and TLSv1, but not SSLv2
- SSLProtocol all -SSLv2
- <% end %>
-
- ServerAdmin <%= var(:server_admin, :default => 'webmaster@tricycledevelopments.com') %>
-
- ServerName <%= var(:canonical_host) %>
- <% var(:aliases).each do |host| %>
- ServerAlias <%= host %>
- <% end %>
-
- DocumentRoot <%= var(:app_root) / 'current/public' %>
-
- ErrorLog <%= var(:app_root) / 'shared/log/error.log' %>
- CustomLog <%= var(:app_root) / 'shared/log/access.log' %> common
-
- RewriteEngine on
- RewriteLog <%= var(:app_root) / 'shared/log/rewrite.log' %>
- RewriteLogLevel 2
-
- # Important rules to prevent exposure of SCM files if you are deploying with Capistrano !
- RewriteRule ^(.*/)?.svn/ - [forbidden,last]
- RewriteRule ^(.*/)?.git/ - [forbidden,last]
-
- <%= var(:extra, :default => '') %>
-
- # Redirect non main sites, to main site
- RewriteCond %{HTTP_HOST} !^(<%= ([var(:canonical_host)] + var(:aliases_without_redirect)).join("|").gsub(/\./, '\.') %>) [NC]
- RewriteCond %{HTTP_HOST} !^$
- RewriteRule ^/?(.*) <%= (var(:certificate).blank? ? "https" : "http") %>://<%= var(:canonical_host) %>/$1 [L,R=301,NE]
-
- # Check for maintenance file and redirect all requests
- RewriteCond <%= var(:app_root) / 'shared/system/maintenance.trigger' %> -f
- RewriteCond %{SCRIPT_FILENAME} !(maintenance.html|css|jpe?g|png|gif)
- RewriteRule ^.*$ /maintenance.html [redirect=503,last]
-
- ErrorDocument 503 /maintenance.html
- ErrorDocument 500 /500.html
-
- RailsEnv <%= var(:rails_environment, :default => 'production') %>
-</VirtualHost>
Please sign in to comment.
Something went wrong with that request. Please try again.