brightbox-server-tools 2.3.6 → 2.3.7

data/bin/railsapp-apache

@@ -40,7 +40,6 @@ def standard_server_contents
   DocumentRoot #{@webroot}
   #{rails_env_if_passenger}
   <Directory "#{@webroot}">
-    Header set Cache-Control "max-age=#{@maxage}"
     Options FollowSymLinks
     AllowOverride None
     Order allow,deny
@@ -57,6 +56,11 @@ def standard_server_contents
   # Rails specific rewrite rules
   RewriteEngine On
 
+  # Set cache-control header for static assets
+  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} -f
+  RewriteRule "^.*$" "$0" [L,E=CACHE:True]
+  Header onsuccess set "Cache-Control" "max-age=#{@maxage}" env=CACHE
+
   # Check for maintenance file and redirect all requests
   ErrorDocument 503 /system/maintenance.html
   RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
@@ -112,6 +116,7 @@ end
 def rails_env_if_passenger
   if @passenger && @rails_env
     %Q{RailsEnv #{@rails_env}}
+    %Q{RackEnv #{@rails_env}}
   end
 end
 
@@ -145,15 +150,16 @@ def https_config
 end
 
 def apt_update
-  system %Q{sudo apt-get update}
+	puts "Running apt-get update"
+  system %Q{sudo apt-get update -qy >/dev/null}
 end
 
 def install_ree
-  system %Q{sudo apt-get install libruby1.8 --assume-yes}
+  system %Q{sudo apt-get install -qy libruby1.8 >/dev/null}
 end
 
 def install_passenger
-  system %Q{sudo apt-get install libapache2-mod-passenger --assume-yes}
+  system %Q{sudo apt-get install -qy libapache2-mod-passenger >/dev/null}
 end
 
 def brightbox_passenger_install

data/lib/brightbox/version.rb

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

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: brightbox-server-tools
 version: !ruby/object:Gem::Version 
-  version: 2.3.6
+  hash: 13
+  prerelease: false
+  segments: 
+  - 2
+  - 3
+  - 7
+  version: 2.3.7
 platform: ruby
 authors: 
 - John Leach
@@ -12,37 +18,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-26 00:00:00 +00:00
+date: 2010-09-07 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: support@brightbox.co.uk
 executables: 
-- railsapp-monit
-- railsapp-maintenance
+- railsapp-apache
 - railsapp-logrotate
+- railsapp-monit
 - railsapp-nginx
 - railsapp-mongrel
-- railsapp-apache
+- railsapp-maintenance
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - LICENSE
-- Rakefile
-- brightbox-gemspec.rb
-- bin/railsapp-monit
-- bin/railsapp-maintenance
+- bin/railsapp-apache
 - bin/railsapp-logrotate
+- bin/railsapp-monit
 - bin/railsapp-nginx
 - bin/railsapp-mongrel
-- bin/railsapp-apache
-- lib/brightbox/maintenance.rb
+- bin/railsapp-maintenance
 - lib/brightbox/version.rb
-- lib/brightbox/webserver-common.rb
 - lib/brightbox/passenger.rb
+- lib/brightbox/maintenance.rb
+- lib/brightbox/webserver-common.rb
 - lib/brightbox/maintenance-site.tar.gz
 has_rdoc: true
 homepage: http://wiki.brightbox.co.uk/docs:gemv2:start
@@ -54,21 +72,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: brightbox
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Brightbox Server configuration scripts

data/Rakefile

@@ -1,28 +0,0 @@
-require 'rake/gempackagetask'
-require "brightbox-gemspec.rb"
-
-namespace :client do
-  Rake::GemPackageTask.new(@client).define
-
-  task :default => [:reinstall, :clobber_package]
-
-  desc "Reinstall the client gem locally"
-  task :reinstall => [:repackage] do
-    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
-
-namespace :server do
-  Rake::GemPackageTask.new(@server).define
-end
-
-task :clobber_package => "client:clobber_package"
-task :package => ["client:package", "server:package"]
-task :repackage => ["client:repackage", "server:package"]

data/brightbox-gemspec.rb

@@ -1,46 +0,0 @@
-#    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/>.
-#
-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", "Caius Durling"]
-  spec.email = "support@brightbox.co.uk"
-  spec.homepage = "http://wiki.brightbox.co.uk/docs:gemv2:start"
-  spec.rubyforge_project = 'brightbox'
-  spec.has_rdoc = false
-end
-
-@server = Gem::Specification.new do |s|
-  add_common(s)
-  s.name = "brightbox-server-tools"
-  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
-
-@client = Gem::Specification.new do |s|
-  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.5")
-  s.summary = "Brightbox rails deployment scripts for Capistrano"
-  s.executable = 'brightbox'
-end
-