brightbox 0.23 → 0.24

data/bin/brightbox-apache

@@ -42,6 +42,7 @@ end
 @balancer_members = (@port..@port+@mongrels-1).collect {|i| "    BalancerMember http://#{@mongrelhost}:#{i}" }.join("\n")
 
 TEMPLATE = <<EOT
+# Created by the Brightbox Capistrano GEM at <%= Time.now %>
 <VirtualHost *:80>
   ServerName <%= @domain %>
   DocumentRoot <%= @webroot %>
@@ -58,16 +59,26 @@ TEMPLATE = <<EOT
 <%= @balancer_members %>
   </Proxy>
 
-  ErrorLog /var/log/apache2/<%= @application %>_error_log
-  CustomLog /var/log/apache2/<%= @application %>_log combined
+  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>
 </VirtualHost>
 EOT
 
 template = ERB.new(TEMPLATE)
 config = template.result
+filename = "/etc/apache2/sites-available/rails-#{@application}"
+if File.exists?(filename)
+  FileUtils.mkdir_p("/etc/apache2/sites-archived")
+  FileUtils.cp filename, "/etc/apache2/sites-archived/rails-#{@application}.#{Time.now.strftime('%y%m%d%H%M%S')}"
+end
 
-File.open("/etc/apache2/sites-available/rails-#{@application}", "w") { |f| f.write config }
-FileUtils.ln_s("/etc/apache2/sites-available/rails-#{@application}", "/etc/apache2/sites-enabled/rails-#{@application}", :force => true)
+File.open(filename, "w") { |f| f.write config }
+FileUtils.ln_s(filename, "/etc/apache2/sites-enabled/rails-#{@application}", :force => true)

data/bin/brightbox-monit

@@ -54,9 +54,9 @@ check process mongrel_<%= @application %>_<%= port %> with pidfile <%= pidfile %
     with timeout 30 seconds
     then restart
 
-  if totalmem > 110 Mb then restart
+  if mem > 110 Mb then restart
   #if cpu is greater than 60% for 2 cycles then alert
-  if cpu > 90% for 5 cycles then restart
+  #if cpu > 90% for 5 cycles then restart
   #if loadavg(5min) greater than 10 for 8 cycles then restart
   if 3 restarts within 5 cycles then timeout
 <% end %>

data/lib/brightbox/recipes.rb

@@ -47,6 +47,7 @@ end
 desc "Reload the monit daemon"
 task :monit_reload, :roles => :app do
   sudo "/usr/sbin/monit reload"
+  sleep 5
 end
 
 desc "Deploy the app to your Brightbox servers for the FIRST TIME.  Sets up apache config starts mongrel."
@@ -56,8 +57,8 @@ task :cold_deploy do
     symlink
   end
 
-  create_mysql_database
-  load_schema
+  create_mysql_database # Fails if already exist to prevent data loss later
+  load_schema # WARNING: This wipes the tables
   migrate
   configure_mongrel_cluster
   monit_reload
@@ -66,6 +67,15 @@ task :cold_deploy do
   reload_apache
 end
 
+desc "Rewrite the Apache and Monit configs and reloads the services"
+task :reconfigure do
+  configure_mongrel_cluster
+  monit_reload
+  restart_mongrel_cluster
+  setup_apache
+  reload_apache
+end
+
 desc "Deploy the app to your Brightbox servers"
 task :deploy do
   transaction do
@@ -83,7 +93,7 @@ desc "Create the mysql database named in the database.yml on the primary db serv
 task :create_mysql_database, :roles => :db, :primary => true do
  read_db_config
  if db_adapter == 'mysql'
-   run "mysql -h #{db_host} --user=#{db_user} -p --execute=\"CREATE DATABASE #{db_name}\" || true" do |channel, stream, data|
+   run "mysql -h #{db_host} --user=#{db_user} -p --execute=\"CREATE DATABASE #{db_name}\"" do |channel, stream, data|
      if data =~ /^Enter password:/
        logger.info data, "[database on #{channel[:host]} asked for password]"
        channel.send_data "#{db_password}\n" 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: brightbox
 version: !ruby/object:Gem::Version 
-  version: "0.23"
-date: 2007-08-07 00:00:00 +01:00
+  version: "0.24"
+date: 2007-11-02 00:00:00 +00:00
 summary: Brightbox rails deployment scripts for Capistrano
 require_paths: 
 - lib
@@ -29,14 +29,14 @@ post_install_message:
 authors: 
 - John Leach
 files: 
-- bin/brightbox
 - bin/brightbox-apache
 - bin/brightbox-monit
+- bin/brightbox
 - lib/brightbox
-- lib/brightbox/generators
 - lib/brightbox/recipes.rb
-- lib/brightbox/generators/brightbox
+- lib/brightbox/generators
 - lib/brightbox/generators/loader.rb
+- lib/brightbox/generators/brightbox
 - lib/brightbox/generators/brightbox/brightboxapache_generator.rb
 - lib/brightbox/generators/brightbox/brightbox_generator.rb
 - lib/brightbox/generators/brightbox/templates
@@ -63,7 +63,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.4"
+        version: 1.4.1
+    - - <
+      - !ruby/object:Gem::Version 
+        version: "1.9"
     version: 
 - !ruby/object:Gem::Dependency 
   name: mongrel_cluster
@@ -72,5 +75,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.1
+        version: 1.0.2
     version: