brightbox-server-tools 2.0.3 → 2.1.2

data/bin/railsapp-apache

@@ -27,21 +27,24 @@ def ssl_certificate_key
   end
 end
 
-def http_config
-  %Q{
-#{config_time_stamp}
-<VirtualHost *:80>
+def standard_server_contents 
+  %Q@
   ServerName #{@domain}
   ServerAlias #{local_app_alias} #{@aliases}
   DocumentRoot #{@webroot}
 
   <Directory "#{@webroot}">
+    Header set Cache-Control "max-age=#{@maxage}"
     Options FollowSymLinks
     AllowOverride None
     Order allow,deny
     Allow from all
   </Directory>
 
+  <Directory "#{@webroot}/system">
+    Header set Cache-Control "no-cache"
+  </Directory>
+
   # Configure mongrel_cluster
   <Proxy balancer://mongrel_cluster>
  #{balancer_members}
@@ -51,58 +54,68 @@ def http_config
   CustomLog /var/log/web/#{@application}.log combined
 
   # Rails specific rewrite rules
-  Include /etc/apache2/brightbox-common
+  RewriteEngine On
+
+  # Check for maintenance file and redirect all requests
+  ErrorDocument 503 /system/maintenance.html
+  RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
+  RewriteCond %{SCRIPT_FILENAME} !^/system
+  RewriteRule ^.*$ /system/maintenance.html [R=503,L]
+
+  # 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]
+
+  # 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
+  BrowserMatch ^Mozilla/4\.0[678] no-gzip
+  BrowserMatch \\bMSIE !no-gzip !gzip-only-text/html
 
   # Add any access limit directives here
   <Location />
     Allow from all
   </Location>
+@
+end
+
+
+def http_config
+  %Q@
+#{config_time_stamp}
+<VirtualHost *:80>
+  #{standard_server_contents}
 </VirtualHost>
-  }
+  @
 end
 
 def https_config
-  %Q{
+  %Q@
 #{config_time_stamp}
 <VirtualHost _default_:443>
   SSLEngine On
   SSLCertificateFile #{@certificate_file}
   #{ssl_certificate_key}
   RequestHeader set X_FORWARDED_PROTO "https"
-  ServerName #{@domain}
-  ServerAlias #{local_app_alias} #{@aliases}
-  DocumentRoot #{@webroot}
-
-  <Directory "#{@webroot}">
-    Options FollowSymLinks
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-  </Directory>
-
-  # Configure mongrel_cluster
-  <Proxy balancer://mongrel_cluster>
- #{balancer_members}
-  </Proxy>
-
-  ErrorLog /var/log/web/#{@application}.err
-  CustomLog /var/log/web/#{@application}.log combined
-
-  # Rails specific rewrite rules
-  Include /etc/apache2/brightbox-common
-
-  # Add any access limit directives here
-  <Location />
-    Allow from all
-  </Location>
+  #{standard_server_contents}
 </VirtualHost>
-  }
+  @
 end
 
 
 def activate_modules(modules)
-  modules.each do |mod|
-    system %Q{/usr/sbin/a2enmod "#{mod}"}
+  enmod="/usr/sbin/a2enmod"
+  if File.executable?(enmod)
+    modules.each do |mod|
+      system %Q{#{enmod} "#{mod}"}
+    end
   end
 end
 
@@ -114,14 +127,16 @@ def configure_ports
 end
 
 def balancer_members
-  (@port..@port+@mongrels-1).collect do |i|
-    "    BalancerMember http://#{@mongrelhost}:#{i} retry=5"
+  @mongrelhost.split(",").collect do |host|
+    (@port..@port+@mongrels-1).collect do |i|
+      "    BalancerMember http://#{host}:#{i} retry=5"
+    end
   end.join("\n")
 end
 
 #MAIN PROGRAM
-@apache_http_modules = %w(proxy_balancer proxy_http rewrite)
-@apache_https_modules = %w(ssl headers)
+@apache_http_modules = %w(proxy_balancer proxy_http rewrite headers deflate)
+@apache_https_modules = %w(ssl)
 
 #Create a normal HTTP config
 @config=http_config

data/bin/railsapp-logrotate

@@ -21,56 +21,58 @@
 
 require 'rubygems'
 require 'optparse'
-require 'erb'
 require 'fileutils'
+require 'brightbox/version'
 
 @size = '100M'
 @keep = '10'
 
-OptionParser.new do |opts|
-  opts.banner = "brightbox-logrotate creates a logrotate config for a Rails app\n"
-  opts.banner << "Usage: #{$0} [options] [args]"
+def has_required_options?
+  [@application, @logdir].all?
+end
+
+@opts = OptionParser.new do |opts|
+  opts.banner = "#{opts.program_name} creates a logrotate config for a Rails app\n#{opts.banner}"
 
   opts.on("-nAPPLICATION_NAME", "--name APPLICATION_NAME",
-    "Name of application (a short useful name for the app such as 'myforum')"
+    "Name of application (a short useful name","for the app such as 'myforum')"
   ) { |value| @application = value }
   opts.on("-lLOG_DIR", "--logdir LOG_DIR",
-    "Full path to the directory containing the rails logs (e.g: /home/rails/myforum/current/log)"
+    "Full path to the directory containing the","rails logs","(e.g: /home/rails/myforum/current/log)"
   ) { |value| @logdir = value }
   opts.on("-sMAX_LOG_SIZE", "--size MAX_LOG_SIZE",
-    "When the current log file reaches this size, rotate it (e.g: 100M, 1G). Default: #{@size}"
+    "When the current log file reaches this","size, rotate it (e.g: 100M, 1G).","Default: #{@size}"
   ) { |value| @size = value }
   opts.on("-kPERIOD_TO_KEEP", "--keep PERIOD_TO_KEEP",
-    "Number of previous compressed logs to keep (default: #{@keep})"
+    "Number of previous compressed logs to keep","(default: #{@keep})"
   ) { |value| @keep = value }
  
-  if ARGV.empty?
+  begin
+    opts.parse!(ARGV)
+    raise OptionParser::ParseError,
+      "You must supply the required arguments" unless has_required_options?
+  rescue OptionParser::ParseError => e
+    warn e.message
     puts opts
     exit 1
-  else
-    opts.parse!(ARGV)
-    if @logdir.nil? or @application.nil?
-      puts "required option missing"
-      exit 1
-    end
   end
 end
 
 
-TEMPLATE = <<EOT
-# Created by brightbox-logrotate at <%= Time.now %>
-<%= @logdir %>/*.log {
+def logrotate_config
+  %Q{
+# Created by #{@opts.program_name} at #{Time.now}
+#{@logdir}/*.log {
   compress
-  size <%= @size %>
-  rotate <%= @keep %>
+  size #{@size}
+  rotate #{@keep}
   missingok
   compress
   copytruncate
 }
-EOT
+}
+end
 
-template = ERB.new(TEMPLATE)
-config = template.result
 filename = "/etc/logrotate.d/rails-#{@application}"
 
-File.open(filename, "w") { |f| f.write config }
+File.open(filename, "w") { |f| f.write logrotate_config }

data/bin/railsapp-maintenance

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+#    Brightbox - Easy Ruby Web Application Deployment
+#    Copyright (C) 2008, Neil Wilson, 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/>.
+#
+
+begin
+  require 'rubygems'
+rescue LoadError
+  # no rubygems to load, so we fail silently
+end
+
+require 'optparse'
+require 'brightbox/version'
+require 'brightbox/maintenance'
+
+
+opts = OptionParser.new do |opts|
+  opts.banner = "Create the default maintenance site\n"
+  opts.banner << "Usage: #{opts.program_name} <directory_name>\n\n"
+
+  begin
+    opts.parse!(ARGV)
+  rescue OptionParser::ParseError => e
+    warn e.message
+    puts opts
+    exit 1
+  end
+end
+
+
+abort "Please specify the directory where the maintenance site should live e.g. '#{@progname} .'" if ARGV.empty?
+abort "Too many arguments; please provide a single directory name." unless ARGV.length == 1
+abort "'#{ARGV.first}' does not exist." unless File.exists?(ARGV.first)
+abort "'#{ARGV.first}' is not a directory." unless File.directory?(ARGV.first)
+
+
+system_dir = ARGV.shift
+if File.exists?(File.join(system_dir, "index.html"))
+  puts "Existing site detected - leaving alone"
+else
+  puts "Deploying default maintenance site"
+  deploy_maintenance_page(system_dir) 
+end

data/bin/railsapp-mongrel

@@ -22,44 +22,46 @@
 require 'rubygems'
 require 'optparse'
 require 'fileutils'
+require 'brightbox/version'
 require 'erb'
 
 @mongrelhost = "127.0.0.1"
 @mongrels = 2
+@port = 9200
 @railsenv = "production"
 @pidfile = "log/mongrel.pid"
 
 def has_required_options?
-  [@application, @config, @pidfile, @port, @mongrels, @railsenv, @railsroot, @mongrelhost].all?
+  [@application, @config, @railsroot].all?
 end
 
 OptionParser.new do |opts|
-  opts.banner = "brightbox-mongrel creates a Mongrel config for a Rails app\n"
-  opts.banner << "Usage: #{$0} [options] [args]"
+  opts.banner = "#{opts.program_name} creates a Mongrel config for a Rails app\n#{opts.banner}"
 
   opts.on("-n", "--name APPLICATION_NAME",
-    "Name of application (a short useful name for the app such as: myforum)"
+    "Name of application (a short useful name",
+    "for the app such as: myforum)"
   ) { |value| @application = value }
   opts.on("-r", "--railsroot RAILS_ROOT",
-    "Full path to rails root (e.g: /home/rails/myforum/current)"
+    "Full path to rails root","(e.g: /home/rails/myforum/current)"
   ) { |value| @railsroot = value }
   opts.on("-C", "--config MONGREL_CONFIG_FILE",
-    "Location of this application's mongrel config file"
+    "Location of this application's mongrel","config file"
   ) { |value| @config = value }
   opts.on("-e", "--railsenv RAILS_ENV",
     "rails environment (default: #{@railsenv})"
   ) { |value| @railsenv = value }
   opts.on("-p", "--port MONGREL_PORT",
-    "Port of the first mongrel service (e.g: 9200)"
+    "Port of the first mongrel service","(default: #{@port})"
   ) { |value| @port = value.to_i }
   opts.on("-s", "--servers MONGRELS",
-    "Number of mongrel servers running (default: #{@mongrels})"
+    "Number of mongrel servers running","(default: #{@mongrels})"
   ) { |value| @mongrels = value.to_i }
   opts.on("-h", "--mongrelhost MONGREL_HOST",
-    "IP/host where mongrel is running (default: #{@mongrelhost})"
+    "IP/host where mongrel is running","(default: #{@mongrelhost})"
   ) { |value| @mongrelhost = value }    
   opts.on("-P", "--pidfile MONGREL_PID_FILE",
-    "Name of Mongrel PID file template (default: #{@pidfile})"
+    "Name of Mongrel PID file template","(default: #{@pidfile})"
   ) { |value| @pidfile = value }    
  
   begin

data/bin/railsapp-monit

@@ -22,7 +22,8 @@
 require 'rubygems'
 require 'optparse'
 require 'fileutils'
-require 'erb'
+require 'brightbox/version'
+require 'uri'
 
 @mongrelhost = "127.0.0.1"
 @mongrels = 2
@@ -30,45 +31,59 @@ require 'erb'
 @railsuser = "rails"
 @railsgroup = "rails"
 @pidfile = "log/mongrel.pid"
+@port = 9200
+@check_url = "http://localhost"
+@max_memory = 110
+@max_cpu = 80
 
 def has_required_options?
-  [@railsuser, @railsgroup, @application, @config, @pidfile, @port, @mongrels, @railsenv, @railsroot, @mongrelhost].all?
+  [@application, @config, @port, @railsroot].all?
 end
 
-OptionParser.new do |opts|
-  opts.banner = "brightbox-monit creates a Monit config for a Rails app\n"
-  opts.banner << "Usage: #{$0} [options] [args]"
+@opts = OptionParser.new do |opts|
+  opts.banner = "#{opts.program_name} creates a Monit config for a Rails app\n#{opts.banner}"
 
   opts.on("-n", "--name APPLICATION_NAME",
-    "Name of application (a short useful name for the app such as: myforum)"
+    "Name of application (a short useful name",
+    "for the app such as: myforum)"
   ) { |value| @application = value }
   opts.on("-r", "--railsroot RAILS_ROOT",
-    "Full path to rails root (e.g: /home/rails/myforum/current)"
+    "Full path to rails root",
+    "(e.g: /home/rails/myforum/current)"
   ) { |value| @railsroot = value }
   opts.on("-C", "--config MONGREL_CONFIG_FILE",
-    "Location of this application's mongrel config file"
+    "Location of this application's mongrel","config file"
   ) { |value| @config = value }
   opts.on("-e", "--railsenv RAILS_ENV",
     "rails environment (default: #{@railsenv})"
   ) { |value| @railsenv = value }
   opts.on("-p", "--port MONGREL_PORT",
-    "Port of the first mongrel service (e.g: 9200)"
+    "Port of the first mongrel service","(default: #{@port})"
   ) { |value| @port = value.to_i }
   opts.on("-s", "--servers MONGRELS",
-    "Number of mongrel servers running (default: #{@mongrels})"
+    "Number of mongrel servers running","(default: #{@mongrels})"
   ) { |value| @mongrels = value.to_i }
   opts.on("-h", "--mongrelhost MONGREL_HOST",
-    "IP/host where mongrel is running (default: #{@mongrelhost})"
+    "IP/host where mongrel is running","(default: #{@mongrelhost})"
   ) { |value| @mongrelhost = value }    
   opts.on("-u", "--user USERNAME",
-    "The unix username the mongrel process should be started as (default: #{@railsuser})"
+    "The unix username the mongrel process","should be started as (default: #{@railsuser})"
   ) { |value| @railsuser = value }
   opts.on("-g", "--group USERNAME",
-    "The unix group the mongrel process should be started as (default: #{@railsgroup})"
+    "The unix group the mongrel process should","be started as (default: #{@railsgroup})"
   ) { |value| @railsgroup = value }
   opts.on("-P", "--pidfile MONGREL_PID_FILE",
-    "Name of Mongrel PID file template (default: #{@pidfile})"
+    "Name of Mongrel PID file template","(default: #{@pidfile})"
   ) { |value| @pidfile = value }    
+  opts.on("-U", "--checkurl URL_TO_CHECK",
+    "URL to check to make sure application is","live (default: #{@check_url})"
+  ) { |value| @check_url = value }    
+  opts.on("-m", "--maxmemory MAX_MONGREL_MEM",
+    "Amount of memory mongrel can use before","being killed (default: #{@max_memory}Mb)"
+  ) { |value| @max_memory = value }    
+  opts.on("-c", "--maxcpu MAX_MONGREL_CPU",
+    "Amount of cpu mongrel can use before","being killed (default: #{@max_cpu}%)"
+  ) { |value| @max_cpu = value }    
  
   begin
     opts.parse(ARGV)
@@ -96,38 +111,52 @@ def mongrel_ports
   @port..(@port + @mongrels - 1)
 end
 
+def updated_url(current_url, new_port)
+  url_holder = URI.parse(current_url)
+  url_holder.port = new_port
+  url_holder.to_s
+end
+
 process_pid_file
 @mongrel_instances = mongrel_ports.collect do |port|
   [port, File.join(@railsroot, port_pid_file(port))]
 end
 
-TEMPLATE = <<EOT
-# Created by brightbox-monit at <%= Time.now %>
-<% @mongrel_instances.each do |port, pidfile| %>
-check process mongrel_<%= @application %>_<%= port %> with pidfile <%= pidfile %>
-  group <%= @application %>
-  start program = "/usr/bin/mongrel_rails cluster::start -C <%= @config %> --clean --only <%= port %>"
+def config_time_stamp
+  "# Created by #{@opts.program_name} at #{Time.now}\n"
+end
+
+def mongrel_config(port, pidfile)
+%Q{
+check process mongrel_#{@application}_#{port} with pidfile #{pidfile}
+  group #{@application}
+  start program = "/usr/bin/mongrel_rails cluster::start -C #{@config} --clean --only #{port}"
     as uid #{@railsuser} and gid #{@railsgroup}
-  stop program = "/usr/bin/mongrel_rails cluster::stop -C <%= @config %> --clean --only <%= port %>"
+  stop program = "/usr/bin/mongrel_rails cluster::stop -C #{@config} --clean --only #{port}"
     as uid #{@railsuser} and gid #{@railsgroup}
 
-  if failed host <%= @mongrelhost %> port <%= port %> protocol http
-    with timeout 30 seconds
+  if failed url #{updated_url(@check_url, port)}
+    with timeout 15 seconds
+            for 2 cycles
     then restart
 
-  if mem > 110 Mb for 3 cycles then restart
-  if cpu > 80% for 5 cycles then restart
-  #if loadavg(5min) greater than 10 for 8 cycles then restart
+  if mem > #{@max_memory} Mb for 3 cycles then restart
+  if cpu > #{@max_cpu}% for 5 cycles then restart
   if 20 restarts within 20 cycles then timeout
-<% end %>
-EOT
+}
+end
+
+def monit_config
+  config_time_stamp +
+  @mongrel_instances.collect do |port, pidfile|
+    mongrel_config(port,pidfile)
+  end.join("\n")
+end
 
-template = ERB.new(TEMPLATE)
-config = template.result
 filename = "/etc/monit/conf.d/rails-#{@application}.monitrc"
 if File.exists?(filename)
   FileUtils.mkdir_p("/etc/monit/archived-configs")
   FileUtils.cp filename, "/etc/monit/archived-configs/rails-#{@application}.monitrc.#{Time.now.strftime('%y%m%d%H%M%S')}"
 end
 
-File.open(filename, "w") { |f| f.write config }
+File.open(filename, "w") { |f| f.write monit_config }

data/bin/railsapp-nginx

@@ -2,7 +2,7 @@
 #    Brightbox - Easy Ruby Web Application Deployment
 #    Copyright (C) 2008, Neil Wilson, Brightbox Systems
 #
-#    This file is part of the Brightbox @application system
+#    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
@@ -23,36 +23,79 @@
 WEBSERVER='nginx'
 require 'brightbox/webserver-common'
 
-
-def http_config
+def standard_server_contents
 <<-EOT
-#{config_time_stamp}
-upstream #{@application}_mongrels {
-  fair;
-  # List of mongrels
-#{balancer_members}
-}
-server {
   server_name #{@domain} #{local_app_alias} #{@aliases};
   root #{@webroot};
+
+  log_not_found  off;
+  log_format main '$remote_addr $host $remote_user [$time_local] '
+   '"$request" $status $body_bytes_sent "$http_referer" '
+   '"$http_user_agent" "$http_x_forwarded_for"' ;
   access_log /var/log/web/#{@application}.log main;
+
+  client_body_temp_path /var/spool/nginx-client-body 1 2;
+  client_max_body_size 32m;
+  client_body_buffer_size 32k;
+
+  tcp_nopush     on;
+
+  gzip_http_version 1.0;
+  gzip_comp_level 2;
+  gzip_proxied any;
+  gzip_min_length  1100;
+  gzip_buffers 16 8k;
+  gzip_types text/plain text/html text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript;
+  # Some version of IE 6 don't handle compression well on some mime-types, so just disable for them
+  gzip_disable "MSIE [1-6].(?!.*SV1)";
+  # Set a vary header so downstream proxies don't send cached gzipped content to IE6
+  gzip_vary on;
+
+  # Send along useful info to the mongrels
+  proxy_set_header  X-Real-IP  $remote_addr;
+  proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
+  proxy_set_header  Host $host;
+  proxy_set_header  X_FORWARDED_PROTO $scheme;
+  proxy_redirect false;
+  proxy_max_temp_file_size 0;
+  proxy_buffering   on;
+  proxy_buffer_size       4k;
+  proxy_buffers     16  32k;
+
+  fastcgi_buffer_size 4k;
+  fastcgi_buffers 16 32k;
     
-  # Capistrano maintenance message support
-  if (-f $document_root/system/maintenance.html) {
-    rewrite ^(.*)$ /system/maintenance.html last;
-    break;
+  location /system {
+    add_header Cache-Control no-cache;
   }
 
   location / {
     ## General Rails error page stuff
     error_page 404              /404.html;
     error_page 422              /422.html;
-    error_page 500 502 503 504  /500.html;
+    error_page 500              /500.html;
+    error_page 502              /502.html;
+    error_page 504              /504.html;
     error_page 403              /403.html;
 
+    error_page 503              /system/maintenance.html;
+    
+    # Capistrano maintenance message support
+    if (-f $document_root/system/maintenance.html) {
+      return 503;
+      break;
+    }
+
+    # Send to mongrels if not a read request
+    if ($request_method !~ "GET|HEAD") {
+      proxy_pass http://#{@application}_mongrels;
+      break;
+    }
+
     # If the file exists then stop here. Saves 4 more stats and some
     # rewrites.
     if (-f $request_filename) { 
+      expires #{@maxage};
       break; 
     }
     # Rails page caching
@@ -66,15 +109,51 @@ server {
     # then send to the mongrels
     if (!-f $request_filename) {
       proxy_pass http://#{@application}_mongrels;
+      break;
     }
   }
+EOT
+end
+
+def ssl_certificate_key
+  if @key_file
+    "  ssl_certificate_key #{key_file};"
+  end
+end
+
+def http_config
+<<-EOT
+#{config_time_stamp}
+upstream #{@application}_mongrels {
+  fair;
+  # List of mongrels
+#{balancer_members}
+}
+server {
+  listen 80;
+  #{standard_server_contents}
+}
+EOT
+end
+
+def https_config
+<<-EOT
+#{config_time_stamp}
+server {
+  listen 443;
+  ssl on;
+  ssl_certificate #{@certificate_file};
+  #{ssl_certificate_key}
+  #{standard_server_contents}
 }
 EOT
 end
 
 def balancer_members
-  (@port..@port+@mongrels-1).collect do |i|
-    "  server #{@mongrelhost}:#{i};"
+  @mongrelhost.split(",").collect do |host|
+    (@port..@port+@mongrels-1).collect do |i|
+      "  server #{host}:#{i};"
+    end
   end.join("\n")
 end
 
@@ -83,3 +162,10 @@ end
 #Create a normal HTTP config
 @config=http_config
 configure_site(@application)
+
+#Create an SSL site if requested
+if @certificate
+  @config=https_config
+  configure_site("default-ssl")
+end
+

data/brightbox-gemspec.rb

@@ -30,7 +30,7 @@ end
 @server = Gem::Specification.new do |s|
   add_common(s)
   s.name = "brightbox-server-tools"
-  s.files = FileList["LICENSE", "Rakefile", "*.rb", "bin/railsapp-*","{lib,spec}/**/*.rb"].exclude(/recipe/).to_a
+  s.files = FileList["LICENSE", "Rakefile", "*.rb", "bin/railsapp-*","lib/**/*.{rb,gz}"].exclude(/recipe/).to_a
   s.summary = "Brightbox Server configuration scripts"
   s.executables = FileList["bin/railsapp-*"].sub(/bin\//,'')
 end
@@ -39,7 +39,7 @@ end
   add_common(s)
   s.name = "brightbox"
   s.files = FileList["LICENSE", "Rakefile", "*.rb", "lib/**/*.rb","bin/brightbox"].exclude("lib/brightbox/webserver-common.rb").to_a
-  s.add_dependency("capistrano", ">= 2.3")
+  s.add_dependency("capistrano", ">= 2.5")
   s.summary = "Brightbox rails deployment scripts for Capistrano"
   s.executable = 'brightbox'
 end

data/lib/brightbox/maintenance.rb

@@ -0,0 +1,24 @@
+#    Brightbox - Easy Ruby Web Application Deployment
+#    Copyright (C) 2008, Neil Wilson, 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/>.
+#
+
+def deploy_maintenance_page(system_directory)
+  maintenance_site = File.join(File.dirname(__FILE__),"maintenance-site.tar.gz")
+  system ("tar --directory #{system_directory} --extract --gzip --file #{maintenance_site}")
+end

data/lib/brightbox/version.rb

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

data/lib/brightbox/webserver-common.rb

@@ -21,16 +21,18 @@
 require 'rubygems'
 require 'optparse'
 require 'fileutils'
+require 'brightbox/version'
 
 @mongrelhost = "127.0.0.1"
 @mongrels = 2
+@port = 9200
 @aliases = nil
 @certificate = nil
 @key_file = nil
-@app_name = File.basename $0
+@maxage = 315360000
 
 def has_required_options?
-  [@application, @webroot, @domain, @port].all? &&
+  [@application, @webroot, @domain].all? &&
     (@certificate || @certificate_key.nil?)
 end
 
@@ -40,11 +42,11 @@ def certificate_file
   test_path = File.join('','etc','ssl','certs', cert_base + '.*')
   candidates = Dir[test_path]
   if candidates.empty?
-    abort "#{@app_name}: Unable to find certificate file for #{@cert_base}"
+    abort "#{@opts.program_name}: Unable to find certificate file for #{@cert_base}"
   end
   result = candidates.pop
   unless candidates.empty?
-    abort "#{@app_name}: #{@cert_base} resolves to more than one file. Please be more specific"
+    abort "#{@opts.program_name}: #{@cert_base} resolves to more than one file. Please be more specific"
   end
   result
 end
@@ -61,50 +63,62 @@ def key_file
   return nil if candidates.empty?
   result = candidates.pop
   unless candidates.empty?
-    abort "#{@app_name}: #{key_base} resolves to more than one file. Please be more specific"
+    abort "#{@opts.program_name}: #{key_base} resolves to more than one file. Please be more specific"
   end
   result
 end
 
-OptionParser.new do |opts|
-  opts.banner = "#{@app_name} creates an #{WEBSERVER} config for a Rails app\n"
-  opts.banner << "Usage: #{@app_name} [options] [args]"
+@opts = OptionParser.new do |opts|
+  opts.banner = "#{opts.program_name} creates an #{WEBSERVER} config for a Rails app\n#{opts.banner}"
 
   opts.on("-n APPLICATION_NAME", "--name APPLICATION_NAME",
-    "Name of application (a short useful name for the app such as 'myforum')"
+    "Name of application (a short useful",
+    "name for the app such as 'myforum')"
   ) { |value| @application = value }
   
   opts.on("-w", "--webroot WEB_ROOT",
-    "Full path to web root (e.g: /home/rails/myforum/current/public)"
+    "Full path to web root",
+    "(e.g: /home/rails/myforum/current/public)"
   ) { |value| @webroot = value }
   
   opts.on("-d", "--domain DOMAIN_NAME",
-    "Domain name for application (e.g: www.example.com)"
+    "Domain name for application",
+    "(e.g: www.example.com)"
   ) { |value| @domain = value }
   
   opts.on("-a", "--aliases ALIASES",
-    "Aliases for domain name, comma separated (e.g: www.example.org,www.example.net)"
+    "Aliases for domain name, comma separated",
+    "(e.g: www.example.org,www.example.net)"
   ) { |value| @aliases = value.to_s.split(',').join(' ')}
   
   opts.on("-p", "--port MONGREL_PORT", Integer,
-    "Port of the first mongrel service"
+    "Port of the first mongrel service",
+    "(default: #{@port})"
   ) { |value| @port = value.to_i }
   
   opts.on("-s", "--servers MONGRELS", Integer,
-    "Number of mongrel servers running (default: #{@mongrels})"
+    "Number of mongrel servers running",
+    "(default: #{@mongrels})"
   ) { |value| @mongrels = value.to_i }
   
   opts.on("-h", "--mongrelhost MONGREL_HOST",
-    "ip/host where mongrel is running (default: #{@mongrelhost})"
+    "ip/host where mongrel is running",
+    "(default: #{@mongrelhost})"
   ) { |value| @mongrelhost = value }
 
   opts.on("-c", "--ssl-cert CERTIFICATE_NAME",
-          "create an SSL configuration using CERTIFICATE_NAME"
+          "create an SSL configuration",
+          "using CERTIFICATE_NAME"
          ) { |value| @certificate = value }
 
   opts.on("-k", "--ssl-key KEY_NAME",
           "Name of private key to use CERTIFICATE"
          ) { |value| @certificate_key = value }
+
+  opts.on("-m", "--max-age MAX_AGE",
+          "Number of seconds to keep static assets","in cache",
+          "(default: #{@maxage})"
+         ) { |value| @maxage = value }
  
   begin
     opts.parse(ARGV)
@@ -145,7 +159,7 @@ def configure_site(site_name)
 end
 
 def config_time_stamp
-  "# Created by #{@app_name} at #{Time.now}"
+  "# Created by #{@opts.program_name} at #{Time.now}"
 end
 
 def local_app_alias

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brightbox-server-tools
 version: !ruby/object:Gem::Version 
-  version: 2.0.3
+  version: 2.1.2
 platform: ruby
 authors: 
 - John Leach
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-16 00:00:00 +01:00
+date: 2008-10-08 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -18,6 +18,7 @@ description:
 email: support@brightbox.co.uk
 executables: 
 - railsapp-nginx
+- railsapp-maintenance
 - railsapp-apache
 - railsapp-logrotate
 - railsapp-monit
@@ -31,12 +32,15 @@ files:
 - Rakefile
 - brightbox-gemspec.rb
 - bin/railsapp-nginx
+- bin/railsapp-maintenance
 - bin/railsapp-apache
 - bin/railsapp-logrotate
 - bin/railsapp-monit
 - bin/railsapp-mongrel
 - 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
 post_install_message: 
@@ -59,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: brightbox
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Brightbox Server configuration scripts