brightbox-server-tools 2.3.5 → 2.3.6

data/Rakefile

@@ -8,8 +8,13 @@ namespace :client do
 
   desc "Reinstall the client gem locally"
   task :reinstall => [:repackage] do
-    sh %Q{sudo gem uninstall -x -v #{@client.version} #{@client.name} }
-    sh %q{sudo gem install pkg/*.gem}
+    begin
+      sh %Q{sudo gem uninstall -x -v #{@client.version} #{@client.name} }
+    rescue RuntimeError => e
+      puts "Gem not installed, continuing."
+    end
+    
+    sh %Q{sudo gem install pkg/#{@client.name}-#{@client.version}.gem}
   end
 
 end

data/bin/railsapp-apache

@@ -23,7 +23,13 @@ require "brightbox/webserver-common"
 
 def ssl_certificate_key
   if @key_file
-    "  SSLCertificateKeyFile #{key_file}"
+    "SSLCertificateKeyFile #{key_file}"
+  end
+end
+
+def ssl_intermediate_certificate
+  if @intermediate_cert
+    "SSLCertificateChainFile #{intermediate_cert_file}"
   end
 end
 
@@ -131,6 +137,7 @@ def https_config
   SSLEngine On
   SSLCertificateFile #{@certificate_file}
   #{ssl_certificate_key}
+  #{ssl_intermediate_certificate}
   #{mongrel_ssl_header}
   #{standard_server_contents}
 </VirtualHost>

data/brightbox-gemspec.rb

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

data/lib/brightbox/version.rb

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

data/lib/brightbox/webserver-common.rb

@@ -42,11 +42,11 @@ def certificate_file
   test_path = File.join('','etc','ssl','certs', cert_base + '.*')
   candidates = Dir[test_path]
   if candidates.empty?
-    abort "#{@opts.program_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 "#{@opts.program_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
@@ -68,6 +68,21 @@ def key_file
   result
 end
 
+def intermediate_cert_file
+  return @intermediate_cert if File.file?(@intermediate_cert)
+  cert_base = File.basename(@intermediate_cert, File.extname(@intermediate_cert))
+  test_path = File.join('','etc','ssl','certs', cert_base + '.*')
+  candidates = Dir[test_path]
+  if candidates.empty?
+    abort "#{@opts.program_name}: Unable to find certificate file for #{cert_base}"
+  end
+  result = candidates.pop
+  unless candidates.empty?
+    abort "#{@opts.program_name}: #{cert_base} resolves to more than one file. Please be more specific"
+  end
+  result
+end
+
 @opts = OptionParser.new do |opts|
   opts.banner = "#{opts.program_name} creates an #{WEBSERVER} config for a Rails app\n#{opts.banner}"
 
@@ -128,6 +143,11 @@ end
           "Name of private key to use CERTIFICATE"
          ) { |value| @certificate_key = value }
 
+  # Optional
+  opts.on("-i", "--ssl-cert-intermediate INTERMEDIATE_NAME",
+          "name of intermediate certificate"
+          ) { |value| @intermediate_cert = value }
+
   opts.on("-m", "--max-age MAX_AGE",
           "Number of seconds to keep static assets","in cache",
           "(default: #{@maxage})"
@@ -145,6 +165,8 @@ end
   if @certificate
     @certificate_file = certificate_file
     @key_file = key_file
+    # Intermediate is optional
+    @intermediate_cert = intermediate_cert_file if @intermediate_cert
   end
 end
 

metadata

@@ -1,29 +1,30 @@
 --- !ruby/object:Gem::Specification 
 name: brightbox-server-tools
 version: !ruby/object:Gem::Version 
-  version: 2.3.5
+  version: 2.3.6
 platform: ruby
 authors: 
 - John Leach
 - Neil Wilson
 - David Smalley
+- Caius Durling
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-05-05 00:00:00 +01:00
+date: 2010-01-26 00:00:00 +00:00
 default_executable: 
 dependencies: []
 
 description: 
 email: support@brightbox.co.uk
 executables: 
-- railsapp-apache
-- railsapp-logrotate
-- railsapp-maintenance
-- railsapp-mongrel
 - railsapp-monit
+- railsapp-maintenance
+- railsapp-logrotate
 - railsapp-nginx
+- railsapp-mongrel
+- railsapp-apache
 extensions: []
 
 extra_rdoc_files: []
@@ -32,19 +33,19 @@ files:
 - LICENSE
 - Rakefile
 - brightbox-gemspec.rb
-- bin/railsapp-apache
-- bin/railsapp-logrotate
-- bin/railsapp-maintenance
-- bin/railsapp-mongrel
 - bin/railsapp-monit
+- bin/railsapp-maintenance
+- bin/railsapp-logrotate
 - bin/railsapp-nginx
+- bin/railsapp-mongrel
+- bin/railsapp-apache
 - lib/brightbox/maintenance.rb
-- lib/brightbox/passenger.rb
 - lib/brightbox/version.rb
 - lib/brightbox/webserver-common.rb
+- lib/brightbox/passenger.rb
 - lib/brightbox/maintenance-site.tar.gz
-has_rdoc: false
-homepage: http://wiki.brightbox.co.uk/docs:thebrightboxgem
+has_rdoc: true
+homepage: http://wiki.brightbox.co.uk/docs:gemv2:start
 licenses: []
 
 post_install_message: 
@@ -67,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: brightbox
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Brightbox Server configuration scripts