sml-rubber 0.9.3 → 0.9.4

data/VERSION

@@ -1 +1 @@
-0.9.3
+0.9.4

data/generators/vulcanize/templates/passenger/config/rubber/deploy-passenger.rb

@@ -5,23 +5,48 @@ namespace :rubber do
   
     rubber.allow_optional_tasks(self)
   
-    after "rubber:base:install_rubygems", "rubber:passenger:custom_install"
+    after "rubber:install_gems", "rubber:passenger:custom_install"
     
     task :custom_install, :roles => :web do
       rubber.sudo_script 'install_passenger', <<-ENDSCRIPT
-        TMPDIR=`mktemp -d` || exit 1
-        cd $TMPDIR
-        # download and install current HEAD of passenger
-        wget -q --output-document=passenger.tgz http://github.com/FooBarWidget/passenger/tarball/master
-        tar -xvf passenger.tgz --strip-components 1
-        rake package:gem && gem install pkg/*gem --no-rdoc --no-ri
         echo -en "\n\n\n\n" | passenger-install-apache2-module
-        wget -q http://rubyforge.org/frs/download.php/41041/ruby-enterprise_1.8.6-20080810-i386.deb
-        dpkg -i ruby-enterprise_1.8.6-20080810-i386.deb
-        # enable needed apache modules / disable ubuntu default site
-        a2enmod rewrite
+        wget -q http://rubyforge.org/frs/download.php/58679/ruby-enterprise_1.8.6-20090610_i386.deb
+        dpkg -i ruby-enterprise_1.8.6-20090610_i386.deb
+        # disable ubuntu default site
         a2dissite default
       ENDSCRIPT
     end
+    
+    # serial_task can only be called after roles defined - not normally a problem, but
+    # rubber auto-roles don't get defined till after all tasks are defined
+    on :load do
+      rubber.serial_task self, :serial_restart, :roles => :web do
+        run "/etc/init.d/apache2 restart"
+      end
+      rubber.serial_task self, :serial_reload, :roles => :web do
+        run "if ! ps ax | grep -v grep | grep -c apache2 &> /dev/null; then /etc/init.d/apache2 start; else /etc/init.d/apache2 reload; fi"
+      end
+    end
+    
+    desc "Stops the apache web server"
+    task :stop, :roles => :web, :on_error => :continue do
+      run "/etc/init.d/apache2 stop"
+    end
+    
+    desc "Starts the apache web server"
+    task :start, :roles => :web do
+      run "/etc/init.d/apache2 start"
+    end
+    
+    desc "Restarts the apache web server"
+    task :restart, :roles => :web do
+      serial_restart
+    end
+  
+    desc "Reloads the apache web server"
+    task :reload, :roles => :web do
+      serial_reload
+    end
+    
   end
 end

data/generators/vulcanize/templates/passenger/config/rubber/role/web/passenger.conf

@@ -2,7 +2,7 @@
   @path = '/etc/apache2/mods-available/passenger.conf'
   @post = 'cd /etc/apache2/mods-enabled && ln -fs ../mods-available/passenger.conf && /etc/init.d/apache2 restart'
 %>
-LoadModule passenger_module /usr/lib/ruby/gems/1.8/gems/passenger-2.1.0/ext/apache2/mod_passenger.so
-PassengerRoot /usr/lib/ruby/gems/1.8/gems/passenger-2.1.0
+LoadModule passenger_module /usr/lib/ruby/gems/1.8/gems/passenger-2.2.4/ext/apache2/mod_passenger.so
+PassengerRoot /usr/lib/ruby/gems/1.8/gems/passenger-2.2.4
 PassengerRuby /opt/ruby-enterprise/bin/ruby
 PassengerUseGlobalQueue on

data/generators/vulcanize/templates/passenger/config/rubber/role/web/vhost.conf

@@ -0,0 +1,27 @@
+<%
+  @path = "/etc/apache2/sites-available/#{rubber_env.app_name}"
+  @post = "a2enmod rewrite && a2ensite #{rubber_env.app_name} && /etc/init.d/apache2 reload"
+%>
+<VirtualHost *:80>
+  ServerName      <%= rubber_env.domain %>
+  ServerAlias	    <%= rubber_env.web_aliases.join(" ") %>
+  DocumentRoot    <%= RUBBER_ROOT + "/public" %>
+
+  ErrorDocument 404 /404.html
+  ErrorDocument 500 /500.html
+
+  SetEnvIf User-Agent "^(.*MSIE.*)|(.*AppleWebKit.*)$" nokeepalive
+
+  RailsEnv  <%= RUBBER_ENV %>
+  RailsAllowModRewrite on
+
+  RewriteEngine On
+  RewriteCond %{HTTP_HOST} ^<%= rubber_env.domain %>$
+  RewriteRule ^(.*)$ http://www.<%= rubber_env.domain %>$1 [R,L]
+
+  # Include <%= RUBBER_ROOT + "/public" %>/config/apache/rewrites.conf
+
+  RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
+  RewriteCond %{SCRIPT_FILENAME} !maintenance.html  
+  RewriteRule ^.*$ /system/maintenance.html [L]
+</VirtualHost>

data/generators/vulcanize/templates/passenger/config/rubber/rubber-passenger.yml

@@ -1,4 +1,4 @@
 roles:
   web:
     packages: [apache2-mpm-prefork apache2-prefork-dev]
-    gems: [fastthread rack]
+    gems: [fastthread, rack, [passenger, 2.2.4]]

data/generators/vulcanize/templates/passenger/templates.yml

@@ -1 +1 @@
-description: Phusion Passenger module
+description: Phusion Passenger module (Apache2)

data/lib/rubber/recipes/rubber/utils.rb

@@ -15,6 +15,15 @@ namespace :rubber do
     instance_alias = ENV['ALIAS'] = rubber.get_env("ALIAS", "Hostname to use for staging instance", true, RUBBER_ENV)
     default_roles = rubber_cfg.environment.bind().staging_roles || "*"
     roles = ENV['ROLES'] = rubber.get_env("ROLES", "Roles to use for staging instance", true, default_roles)
+
+    # some bootstraps update code (bootstrap_db) but if you don't have that role, need to do it here
+    # Since release directory variable gets reused by cap, we have to just do the symlink here - doing
+    # a update again will fail
+    set :rubber_code_was_updated, false
+    after "deploy:update_code" do
+      set :rubber_code_was_updated, true
+    end
+
     if rubber_cfg.instance[instance_alias]
       logger.info "Instance already exists, skipping to bootstrap"
     else
@@ -23,9 +32,9 @@ namespace :rubber do
     rubber.bootstrap
     # stop everything in case we have a bundled instance with monit, etc starting at boot
     deploy.stop rescue nil
-    # bootstrap_db does setup/update_code, so since release directory
-    # variable gets reused by cap, we have to just do the symlink here - doing
-    # a update again will fail
+    if ! rubber_code_was_updated
+      deploy.update_code
+    end
     deploy.symlink
     deploy.migrate
     deploy.start

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sml-rubber
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors: 
 - Matt Conway
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-10 00:00:00 -07:00
+date: 2009-08-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -177,6 +177,7 @@ files:
 - generators/vulcanize/templates/nginx/templates.yml
 - generators/vulcanize/templates/passenger/config/rubber/deploy-passenger.rb
 - generators/vulcanize/templates/passenger/config/rubber/role/web/passenger.conf
+- generators/vulcanize/templates/passenger/config/rubber/role/web/vhost.conf
 - generators/vulcanize/templates/passenger/config/rubber/rubber-passenger.yml
 - generators/vulcanize/templates/passenger/templates.yml
 - generators/vulcanize/templates/sphinx/config/rubber/common/sphinx.yml
@@ -214,6 +215,7 @@ files:
 - lib/rubber/util.rb
 has_rdoc: false
 homepage: http://github.com/wr0ngway/rubber
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -234,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubber
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A capistrano plugin for managing multi-instance deployments to the cloud (ec2)