brightbox-server-tools 2.1.2 → 2.2

data/bin/railsapp-apache

@@ -32,7 +32,7 @@ def standard_server_contents
   ServerName #{@domain}
   ServerAlias #{local_app_alias} #{@aliases}
   DocumentRoot #{@webroot}
-
+  #{rails_env_if_passenger}
   <Directory "#{@webroot}">
     Header set Cache-Control "max-age=#{@maxage}"
     Options FollowSymLinks
@@ -44,12 +44,7 @@ def standard_server_contents
   <Directory "#{@webroot}/system">
     Header set Cache-Control "no-cache"
   </Directory>
-
-  # Configure mongrel_cluster
-  <Proxy balancer://mongrel_cluster>
- #{balancer_members}
-  </Proxy>
-
+  #{mongrel_balancer_configuration}
   ErrorLog /var/log/web/#{@application}.err
   CustomLog /var/log/web/#{@application}.log combined
 
@@ -64,15 +59,10 @@ def standard_server_contents
 
   # Rewrite index to check for static
   RewriteRule ^/$ /index.html [QSA]
-
+  
   # Rewrite to check for Rails cached page
   RewriteRule ^([^.]+)$ $1.html [QSA]
-
-  # Redirect all non-static requests to cluster
-  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
-  RewriteCond %{REQUEST_METHOD} !^(GET|HEAD)
-  RewriteRule ^/(.*)$ balancer://mongrel_cluster%{REQUEST_URI} [P,QSA,L]
-
+  #{mongrel_rewrite_configuration}
   # Deflate
   AddOutputFilterByType DEFLATE text/plain text/html text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript
   BrowserMatch ^Mozilla/4 gzip-only-text/html
@@ -86,6 +76,43 @@ def standard_server_contents
 @
 end
 
+def mongrel_balancer_configuration
+  unless @passenger
+    %Q@
+  
+  # Configure mongrel_cluster
+  <Proxy balancer://mongrel_cluster>
+    #{balancer_members}
+  </Proxy>
+   
+    @
+  end
+end
+
+def mongrel_rewrite_configuration
+  unless @passenger
+    %Q@
+    
+  # Redirect all non-static requests to cluster
+  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f [OR]
+  RewriteCond %{REQUEST_METHOD} !^(GET|HEAD)
+  RewriteRule ^/(.*)$ balancer://mongrel_cluster%{REQUEST_URI} [P,QSA,L]
+    
+    @
+  end
+end
+
+def rails_env_if_passenger
+  if @passenger && @rails_env
+    %Q{RailsEnv #{@rails_env}}
+  end
+end
+
+def mongrel_ssl_header
+  unless @passenger
+  %Q{RequestHeader set X_FORWARDED_PROTO "https"}
+  end
+end
 
 def http_config
   %Q@
@@ -103,12 +130,31 @@ def https_config
   SSLEngine On
   SSLCertificateFile #{@certificate_file}
   #{ssl_certificate_key}
-  RequestHeader set X_FORWARDED_PROTO "https"
+  #{mongrel_ssl_header}
   #{standard_server_contents}
 </VirtualHost>
   @
 end
 
+def apt_update
+  system %Q{sudo apt-get update}
+end
+
+def install_ree
+  system %Q{sudo apt-get install libruby1.8 --assume-yes}
+end
+
+def install_passenger
+  system %Q{sudo apt-get install libapache2-mod-passenger --assume-yes}
+end
+
+def brightbox_passenger_install
+  apt_update
+  unless use_ree
+    install_ree # For now - don't install Ruby Enterprise Edition unless told to
+  end
+  install_passenger
+end
 
 def activate_modules(modules)
   enmod="/usr/sbin/a2enmod"
@@ -137,6 +183,10 @@ end
 #MAIN PROGRAM
 @apache_http_modules = %w(proxy_balancer proxy_http rewrite headers deflate)
 @apache_https_modules = %w(ssl)
+if @passenger
+  brightbox_passenger_install
+  @apache_http_modules << "passenger"
+end
 
 #Create a normal HTTP config
 @config=http_config

data/brightbox-gemspec.rb

@@ -20,7 +20,7 @@
 require File.join(File.dirname(__FILE__),"lib/brightbox/version")
 def add_common(spec)
   spec.version = Brightbox::VERSION
-  spec.authors = ["John Leach","Neil Wilson"]
+  spec.authors = ["John Leach","Neil Wilson","David Smalley"]
   spec.email = "support@brightbox.co.uk"
   spec.homepage = "http://wiki.brightbox.co.uk/docs:thebrightboxgem"
   spec.rubyforge_project = 'brightbox'

data/lib/brightbox/passenger.rb

@@ -0,0 +1,21 @@
+#    Brightbox - Easy Ruby Web Application Deployment
+#    Copyright (C) 2008, David Smalley, Brightbox Systems
+#
+#    This file is part of the Brightbox deployment system
+#
+#    Brightbox gem is free software: you can redistribute it and/or modify it
+#    under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License,
+#    or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#    Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General
+#    Public License along with this program.  If not, see
+#    <http://www.gnu.org/licenses/>.
+#
+Capistrano::Configuration.instance(true).load File.join(File.dirname(__FILE__), "recipes", "deploy", "passenger.rb")
+Capistrano::Configuration.instance(true).load File.join(File.dirname(__FILE__), "recipes", "configure", "passenger.rb")

data/lib/brightbox/version.rb

@@ -1,5 +1,5 @@
 module Brightbox
-  VERSION = "2.1.2"
+  VERSION = "2.2"
 end
 # Set global scope version so that OptionParser picks it up.
 ::Version = Brightbox::VERSION

data/lib/brightbox/webserver-common.rb

@@ -91,6 +91,19 @@ end
     "(e.g: www.example.org,www.example.net)"
   ) { |value| @aliases = value.to_s.split(',').join(' ')}
   
+  if WEBSERVER == "apache2"
+    
+    opts.on("-r", "--passenger",
+      "Use phusion passenger (Apache only)",
+      "(Will ignore any mongrel values passed)"
+    ) { |value| @passenger = value }
+    
+    opts.on("-e", "--railsenv ENV",
+      "Set RailsEnv for passenger (Apache only)"
+    ) { |value| @rails_env = value }
+    
+  end
+  
   opts.on("-p", "--port MONGREL_PORT", Integer,
     "Port of the first mongrel service",
     "(default: #{@port})"

metadata

@@ -1,28 +1,29 @@
 --- !ruby/object:Gem::Specification 
 name: brightbox-server-tools
 version: !ruby/object:Gem::Version 
-  version: 2.1.2
+  version: "2.2"
 platform: ruby
 authors: 
 - John Leach
 - Neil Wilson
+- David Smalley
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-10-08 00:00:00 +01:00
+date: 2009-01-09 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
 description: 
 email: support@brightbox.co.uk
 executables: 
-- railsapp-nginx
-- railsapp-maintenance
 - railsapp-apache
 - railsapp-logrotate
-- railsapp-monit
+- railsapp-maintenance
 - railsapp-mongrel
+- railsapp-monit
+- railsapp-nginx
 extensions: []
 
 extra_rdoc_files: []
@@ -31,15 +32,16 @@ files:
 - LICENSE
 - Rakefile
 - brightbox-gemspec.rb
-- bin/railsapp-nginx
-- bin/railsapp-maintenance
 - bin/railsapp-apache
 - bin/railsapp-logrotate
-- bin/railsapp-monit
+- bin/railsapp-maintenance
 - bin/railsapp-mongrel
+- bin/railsapp-monit
+- bin/railsapp-nginx
+- lib/brightbox/maintenance.rb
+- lib/brightbox/passenger.rb
 - lib/brightbox/version.rb
 - lib/brightbox/webserver-common.rb
-- lib/brightbox/maintenance.rb
 - lib/brightbox/maintenance-site.tar.gz
 has_rdoc: false
 homepage: http://wiki.brightbox.co.uk/docs:thebrightboxgem
@@ -63,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: brightbox
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Brightbox Server configuration scripts