sml-rubber 0.9.9 → 0.9.10

data/lib/rubber/recipes/rubber/load_balancers.rb

@@ -0,0 +1,27 @@
+namespace :rubber do
+
+  desc <<-DESC
+    Sets up the network load balancers
+  DESC
+  required_task :setup_load_balancers do
+    setup_load_balancers()
+  end
+
+  desc <<-DESC
+    Describes the network load balancers
+  DESC
+  required_task :describe_load_balancers do
+    lbs = cloud.describe_load_balancers()
+    pp lbs
+  end
+
+  def setup_load_balancers
+    # get remote lbs
+    # for each local not in remote, add it
+    #   get all zones for all instances for roles, and make sure in lb
+    #   warn if lb not balanced (count of instances per zone is equal)
+    # for each local that is in remote, sync listeners and zones
+    # for each remote not in local, remove it
+  end
+
+end

data/lib/rubber/recipes/rubber/security_groups.rb

@@ -45,8 +45,8 @@ namespace :rubber do
     env = rubber_cfg.environment.bind(roles, host)
     security_group_defns = env.security_groups
     if env.auto_security_groups
-      sghosts = (rubber_cfg.instance.collect{|ic| ic.name } + [host]).uniq.compact
-      sgroles = (rubber_cfg.instance.all_roles + roles).uniq.compact
+      sghosts = (rubber_instances.collect{|ic| ic.name } + [host]).uniq.compact
+      sgroles = (rubber_instances.all_roles + roles).uniq.compact
       security_group_defns = inject_auto_security_groups(security_group_defns, sghosts, sgroles)
       sync_security_groups(security_group_defns)
     else
@@ -67,8 +67,7 @@ namespace :rubber do
   end
 
   def isolate_prefix
-    env = rubber_cfg.environment.bind()
-    return "#{env.app_name}_#{RUBBER_ENV}_"
+    return "#{rubber_env.app_name}_#{RUBBER_ENV}_"
   end
 
   def isolate_group_name(group_name)
@@ -93,11 +92,10 @@ namespace :rubber do
   end
 
   def sync_security_groups(groups)
-    env = rubber_cfg.environment.bind()
     return unless groups
 
     groups = Rubber::Util::stringify(groups)
-    groups = isolate_groups(groups) if env.isolate_security_groups
+    groups = isolate_groups(groups) if rubber_env.isolate_security_groups
     group_keys = groups.keys.clone()
     
     # For each group that does already exist in ec2
@@ -106,7 +104,7 @@ namespace :rubber do
       group_name = cloud_group[:name]
 
       # skip those groups that don't belong to this project/env
-      next if env.isolate_security_groups && group_name !~ /^#{isolate_prefix}/
+      next if rubber_env.isolate_security_groups && group_name !~ /^#{isolate_prefix}/
 
       if group_keys.delete(group_name)
         # sync rules

data/lib/rubber/recipes/rubber/setup.rb

@@ -9,7 +9,7 @@ namespace :rubber do
     upgrade_packages
     install_packages
     setup_volumes
-    add_gem_sources
+    setup_gem_sources
     install_gems
     deploy.setup
   end
@@ -33,10 +33,9 @@ namespace :rubber do
     hosts_file = '/etc/hosts'
 
     # Generate /etc/hosts contents for the local machine from instance config
-    env = rubber_cfg.environment.bind()
-    delim = "## rubber config #{env.domain} #{RUBBER_ENV}"
+    delim = "## rubber config #{rubber_env.domain} #{RUBBER_ENV}"
     local_hosts = delim + "\n"
-    rubber_cfg.instance.each do |ic|
+    rubber_instances.each do |ic|
       # don't add unqualified hostname in local hosts file since user may be
       # managing multiple domains with same aliases
       hosts_data = [ic.full_name, ic.external_host, ic.internal_host].join(' ')
@@ -57,7 +56,7 @@ namespace :rubber do
     Sets up aliases in dynamic dns provider for instance hostnames based on contents of instance.yml.
   DESC
   required_task :setup_dns_aliases do
-    rubber_cfg.instance.each do |ic|
+    rubber_instances.each do |ic|
       update_dyndns(ic)
     end
   end
@@ -73,12 +72,12 @@ namespace :rubber do
     delim = "## rubber config"
     delim = "#{delim} #{RUBBER_ENV}"
     remote_hosts = delim + "\n"
-    rubber_cfg.instance.each do |ic|
+    rubber_instances.each do |ic|
       hosts_data = [ic.name, ic.full_name, ic.external_host, ic.internal_host].join(' ')
       remote_hosts << ic.internal_ip << ' ' << hosts_data << "\n"
     end
     remote_hosts << delim << "\n"
-    if rubber_cfg.instance.size > 0
+    if rubber_instances.size > 0
       # write out the hosts file for the remote instances
       # NOTE that we use "capture" to get the existing hosts
       # file, which only grabs the hosts file from the first host
@@ -127,7 +126,7 @@ namespace :rubber do
   end
 
   desc <<-DESC
-    Install extra Ubuntu packages. Set 'packages' in rubber.yml to \
+    Install Ubuntu packages. Set 'packages' in rubber.yml to \
     be an array of strings.
   DESC
   task :install_packages do
@@ -135,7 +134,7 @@ namespace :rubber do
   end
 
   desc <<-DESC
-    Install extra ruby gems. Set 'gems' in rubber.yml to \
+    Install ruby gems. Set 'gems' in rubber.yml to \
     be an array of strings.
   DESC
   task :install_gems do
@@ -143,13 +142,50 @@ namespace :rubber do
   end
 
   desc <<-DESC
-    Add extra ruby gems sources. Set 'gemsources' in rubber.yml to \
+    Install ruby gems defined in the rails environment.rb
+  DESC
+  after "deploy:symlink", "rubber:install_rails_gems" if Rubber::Util.is_rails?
+  task :install_rails_gems do
+    sudo "sh -c 'cd #{current_path} && RAILS_ENV=#{RUBBER_ENV} rake gems:install'"
+  end
+
+  desc <<-DESC
+    Setup ruby gems sources. Set 'gemsources' in rubber.yml to \
     be an array of URI strings.
   DESC
-  task :add_gem_sources do
-    env = rubber_cfg.environment.bind()
-    if env.gemsources
-      env.gemsources.each { |source| sudo "gem sources -a #{source}"}
+  task :setup_gem_sources do
+    if rubber_env.gemsources
+      script = prepare_script 'gem_sources_helper', <<-'ENDSCRIPT'
+        ruby - $@ <<-'EOF'
+
+        sources = ARGV
+
+        installed = []
+        `gem sources -l`.grep(/^[^*]/) do |line|
+            line = line.strip
+            installed << line if line.size > 0
+        end
+
+        to_install = sources - installed
+        to_remove = installed - sources
+
+        if to_install.size > 0
+          to_install.each do |source|
+            system "gem sources -a #{source}"
+            fail "Unable to add gem sources" if $?.exitstatus > 0
+          end
+        end
+        if to_remove.size > 0
+          to_remove.each do |source|
+            system "gem sources -r #{source}"
+            fail "Unable to remove gem sources" if $?.exitstatus > 0
+          end
+        end
+
+        'EOF'
+      ENDSCRIPT
+
+      sudo "sh #{script} #{rubber_env.gemsources.join(' ')}"
     end
   end
 

data/lib/rubber/recipes/rubber/static_ips.rb

@@ -5,10 +5,10 @@ namespace :rubber do
     Sets up static IPs for the instances configured to have them
   DESC
   required_task :setup_static_ips do
-    rubber_cfg.instance.each do |ic|
+    rubber_instances.each do |ic|
       env = rubber_cfg.environment.bind(ic.role_names, ic.name)
       if env.use_static_ip
-        artifacts = rubber_cfg.instance.artifacts
+        artifacts = rubber_instances.artifacts
         ip = artifacts['static_ips'][ic.name] rescue nil
 
         # first allocate the static ip if we don't have a global record (artifacts) for it
@@ -16,7 +16,7 @@ namespace :rubber do
           logger.info "Allocating static IP for #{ic.full_name}"
           ip = allocate_static_ip()
           artifacts['static_ips'][ic.name] = ip
-          rubber_cfg.instance.save
+          rubber_instances.save
         end
 
         # then, associate it if we don't have a record (on instance) of association
@@ -29,7 +29,7 @@ namespace :rubber do
           ic.internal_host = instance[:internal_host]
           ic.external_ip = ip
           ic.static_ip = ip
-          rubber_cfg.instance.save()
+          rubber_instances.save()
 
           logger.info "Waiting for static ip to associate"
           while true do
@@ -96,12 +96,12 @@ namespace :rubber do
     cloud.destroy_static_ip(ip) rescue logger.info("IP was not attached")
 
     logger.info "Removing ip #{ip} from rubber instances file"
-    artifacts = rubber_cfg.instance.artifacts
+    artifacts = rubber_instances.artifacts
     artifacts['static_ips'].delete_if {|k,v| v == ip}
-    rubber_cfg.instance.each do |ic|
+    rubber_instances.each do |ic|
       ic.static_ip = nil if ic.static_ip == ip
     end
-    rubber_cfg.instance.save
+    rubber_instances.save
   end
 
 end

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

@@ -8,12 +8,12 @@ namespace :rubber do
     e.g. RUBBER_ENV=matt cap create_staging
   DESC
   required_task :create_staging do
-    if rubber_cfg.instance.size > 0
+    if rubber_instances.size > 0
       value = Capistrano::CLI.ui.ask("The #{RUBBER_ENV} environment already has instances, Are you SURE you want to create a staging instance that may interact with them [y/N]?: ")
       fatal("Exiting", 0) if value !~ /^y/
     end
     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 || "*"
+    default_roles = rubber_env.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
@@ -24,7 +24,7 @@ namespace :rubber do
       set :rubber_code_was_updated, true
     end
 
-    if rubber_cfg.instance[instance_alias]
+    if rubber_instances[instance_alias]
       logger.info "Instance already exists, skipping to bootstrap"
     else
       rubber.create
@@ -134,7 +134,7 @@ namespace :rubber do
 
   def find_alias(ip, instance_id, do_connect=true)
     if instance_id
-      instance = rubber_cfg.instance.find {|i| i.instance_id == instance_id }
+      instance = rubber_instances.find {|i| i.instance_id == instance_id }
       local_alias = instance.full_name if instance
     end
     local_alias ||= File.read("/etc/hosts").grep(/#{ip}/).first.split[1] rescue nil
@@ -150,8 +150,7 @@ namespace :rubber do
   def prepare_script(name, contents)
     script = "/tmp/#{name}"
     # this lets us abort a script if a command in the middle of it errors out
-    env = rubber_cfg.environment.bind()
-    contents = "#{env.stop_on_error_cmd}\n#{contents}" if env.stop_on_error_cmd
+    contents = "#{rubber_env.stop_on_error_cmd}\n#{contents}" if rubber_env.stop_on_error_cmd
     put(contents, script)
     return script
   end
@@ -188,7 +187,7 @@ namespace :rubber do
   # be installed.
   def get_host_options(cfg_name, &block)
     opts = {}
-    rubber_cfg.instance.each do | ic|
+    rubber_instances.each do | ic|
       env = rubber_cfg.environment.bind(ic.role_names, ic.name)
       cfg_value = env[cfg_name]
       if cfg_value

data/lib/rubber/recipes/rubber/volumes.rb

@@ -5,7 +5,7 @@ namespace :rubber do
     All volumes defined in rubber.yml will be created if neccessary, and attached/mounted on their associated instances
   DESC
   required_task :setup_volumes do
-    rubber_cfg.instance.filtered.each do |ic|
+    rubber_instances.filtered.each do |ic|
       env = rubber_cfg.environment.bind(ic.role_names, ic.name)
       created_vols = []
       vol_specs = env.volumes || []
@@ -71,7 +71,7 @@ namespace :rubber do
   def setup_volume(ic, vol_spec)
     created = nil
     key = "#{ic.name}_#{vol_spec['device']}"
-    artifacts = rubber_cfg.instance.artifacts
+    artifacts = rubber_instances.artifacts
     vol_id = artifacts['volumes'][key]
 
     # first create the volume if we don't have a global record (artifacts) for it
@@ -79,7 +79,7 @@ namespace :rubber do
       logger.info "Creating volume for #{ic.full_name}:#{vol_spec['device']}"
       vol_id = create_volume(vol_spec['size'], vol_spec['zone'])
       artifacts['volumes'][key] = vol_id
-      rubber_cfg.instance.save
+      rubber_instances.save
       created = vol_spec['device']
     end
 
@@ -89,7 +89,7 @@ namespace :rubber do
       logger.info "Attaching volume #{vol_id} to #{ic.full_name}:#{vol_spec['device']}"
       attach_volume(vol_id, ic.instance_id, vol_spec['device'])
       ic.volumes << vol_id
-      rubber_cfg.instance.save
+      rubber_instances.save
 
       print "Waiting for volume to attach"
       while true do
@@ -151,7 +151,7 @@ namespace :rubber do
       _setup_partition
 
       ic.partitions << part_id
-      rubber_cfg.instance.save
+      rubber_instances.save
       created = part_id
 
     end
@@ -253,12 +253,12 @@ namespace :rubber do
     cloud.destroy_volume(volume_id)
 
     logger.info "Removing volume #{volume_id} from rubber instances file"
-    artifacts = rubber_cfg.instance.artifacts
+    artifacts = rubber_instances.artifacts
     artifacts['volumes'].delete_if {|k,v| v == volume_id}
-    rubber_cfg.instance.each do |ic|
+    rubber_instances.each do |ic|
       ic.volumes.delete(volume_id) if ic.volumes
     end
-    rubber_cfg.instance.save
+    rubber_instances.save
   end
   
 end

data/lib/rubber/util.rb

@@ -29,5 +29,9 @@ module Rubber
       open("|sudo tee #{path} > /dev/null", perms, &block)
     end
 
+    def self.is_rails?
+      File.exist?(File.join(RUBBER_ROOT, 'config', 'environment.rb'))
+    end
+
   end
 end

data/test/instance_test.rb

@@ -35,4 +35,59 @@ class InstanceTest < Test::Unit::TestCase
     
   end
 
+  def test_equality
+    assert RoleItem.new('a').eql?(RoleItem.new('a'))
+    assert RoleItem.new('a') == RoleItem.new('a')
+    assert_equal RoleItem.new('a').hash, RoleItem.new('a').hash
+
+    assert ! RoleItem.new('a').eql?(RoleItem.new('b'))
+    assert RoleItem.new('a') != RoleItem.new('b')
+    assert_not_equal RoleItem.new('a').hash, RoleItem.new('b').hash
+
+    assert RoleItem.new('a', {'a' => 'b', 1 => true}).eql?(RoleItem.new('a', {'a' => 'b', 1 => true}))
+    assert RoleItem.new('a', {'a' => 'b', 1 => true}) == RoleItem.new('a', {'a' => 'b', 1 => true})
+    assert_equal RoleItem.new('a', {'a' => 'b', 1 => true}).hash, RoleItem.new('a', {'a' => 'b', 1 => true}).hash
+
+    assert ! RoleItem.new('a', {'a' => 'b', 1 => true}).eql?(RoleItem.new('a', {'a' => 'b', 2 => true}))
+    assert RoleItem.new('a', {'a' => 'b', 1 => true}) != RoleItem.new('a', {'a' => 'b', 2 => true})
+    assert_equal RoleItem.new('a', {'a' => 'b', 1 => true}).hash, RoleItem.new('a', {'a' => 'b', 2 => true}).hash
+  end
+
+  def test_role_parse
+    assert_equal RoleItem.new('a'), RoleItem.parse("a")
+    assert_equal RoleItem.new('a', {'b' => 'c'}), RoleItem.parse("a:b=c")
+    assert_equal RoleItem.new('a', {'b' => 'c', 'd' => 'e'}), RoleItem.parse("a:b=c;d=e")
+    assert_equal RoleItem.new('a', {'b' => true, 'c' => false}), RoleItem.parse("a:b=true;c=false")
+  end
+
+  def test_role_to_s
+    assert_equal "a", RoleItem.new('a').to_s
+    assert_equal "a:b=c", RoleItem.new('a', {'b' => 'c'}).to_s
+    assert_equal "a:b=c;d=e", RoleItem.new('a', {'b' => 'c', 'd' => 'e'}).to_s
+    assert_equal "a:b=true;c=false", RoleItem.new('a', {'b' => true, 'c' => false}).to_s
+  end
+
+  def test_expand_role_dependencies
+    deps = { RoleItem.new('a') => RoleItem.new('b'),
+             RoleItem.new('b') => RoleItem.new('c'),
+             RoleItem.new('c') => [RoleItem.new('d'), RoleItem.new('a')]}
+    roles = [RoleItem.new('a'),RoleItem.new('b'),RoleItem.new('c'),RoleItem.new('d')]
+    assert_equal roles, RoleItem.expand_role_dependencies(RoleItem.new('a'), deps).sort
+    assert_equal roles, RoleItem.expand_role_dependencies([RoleItem.new('a'), RoleItem.new('d')], deps).sort
+
+    deps = { RoleItem.new('mysql_master') => RoleItem.new('db', {'primary' => true}),
+             RoleItem.new('mysql_slave') => RoleItem.new('db'),
+             RoleItem.new('db', {'primary' => true}) => RoleItem.new('mysql_master'),
+             RoleItem.new('db') => RoleItem.new('mysql_slave')
+    }
+    assert_equal [RoleItem.new('db', 'primary' => true), RoleItem.new('mysql_master')],
+                 RoleItem.expand_role_dependencies(RoleItem.new('mysql_master'), deps).sort
+    assert_equal [RoleItem.new('db', 'primary' => true), RoleItem.new('mysql_master')],
+                 RoleItem.expand_role_dependencies(RoleItem.new('db', 'primary' => true), deps).sort
+    assert_equal [RoleItem.new('db'), RoleItem.new('mysql_slave')],
+                 RoleItem.expand_role_dependencies(RoleItem.new('mysql_slave'), deps).sort
+    assert_equal [RoleItem.new('db'), RoleItem.new('mysql_slave')],
+                 RoleItem.expand_role_dependencies(RoleItem.new('db'), deps).sort
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sml-rubber
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Matt Conway
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-03 00:00:00 -07:00
+date: 2009-09-15 00:00:00 -07:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,11 +88,15 @@ files:
 - bin/vulcanize
 - generators/vulcanize/USAGE
 - generators/vulcanize/templates/apache/config/rubber/deploy-apache.rb
-- generators/vulcanize/templates/apache/config/rubber/role/web/deflate.conf
-- generators/vulcanize/templates/apache/config/rubber/role/web/expires.conf
-- generators/vulcanize/templates/apache/config/rubber/role/web/headers.conf
-- generators/vulcanize/templates/apache/config/rubber/role/web/setenvif.conf
-- generators/vulcanize/templates/apache/config/rubber/role/web/vhost.conf
+- generators/vulcanize/templates/apache/config/rubber/role/apache/deflate.conf
+- generators/vulcanize/templates/apache/config/rubber/role/apache/expires.conf
+- generators/vulcanize/templates/apache/config/rubber/role/apache/headers.conf
+- generators/vulcanize/templates/apache/config/rubber/role/apache/monit-apache.conf
+- generators/vulcanize/templates/apache/config/rubber/role/apache/ports.conf
+- generators/vulcanize/templates/apache/config/rubber/role/apache/setenvif.conf
+- generators/vulcanize/templates/apache/config/rubber/role/web_tools/tools-apache-vhost.conf
+- generators/vulcanize/templates/apache/config/rubber/role/web_tools/tools-apache.auth
+- generators/vulcanize/templates/apache/config/rubber/role/web_tools/tools-index.html
 - generators/vulcanize/templates/apache/config/rubber/rubber-apache.yml
 - generators/vulcanize/templates/apache/templates.yml
 - generators/vulcanize/templates/base/Capfile
@@ -106,7 +110,12 @@ files:
 - generators/vulcanize/templates/base/script/cron-runner
 - generators/vulcanize/templates/base/script/cron-sh
 - generators/vulcanize/templates/base/templates.yml
-- generators/vulcanize/templates/complete_mysql/templates.yml
+- generators/vulcanize/templates/complete_mongrel_mysql/config/rubber/role/haproxy/haproxy-mongrel.conf
+- generators/vulcanize/templates/complete_mongrel_mysql/config/rubber/role/nginx/nginx-mongrel.conf
+- generators/vulcanize/templates/complete_mongrel_mysql/config/rubber/rubber-complete.yml
+- generators/vulcanize/templates/complete_mongrel_mysql/templates.yml
+- generators/vulcanize/templates/complete_passenger_mysql/config/rubber/role/haproxy/haproxy-passenger.conf
+- generators/vulcanize/templates/complete_passenger_mysql/config/rubber/rubber-complete.yml
 - generators/vulcanize/templates/complete_passenger_mysql/templates.yml
 - generators/vulcanize/templates/cruise/config/rubber/deploy-cruise.rb
 - generators/vulcanize/templates/cruise/config/rubber/role/cruise/cruise
@@ -117,8 +126,8 @@ files:
 - generators/vulcanize/templates/cruise/config/rubber/rubber-cruise.yml
 - generators/vulcanize/templates/cruise/templates.yml
 - generators/vulcanize/templates/haproxy/config/rubber/deploy-haproxy.rb
+- generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/haproxy-base.conf
 - generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/haproxy-default.conf
-- generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/haproxy.conf
 - generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/monit-haproxy.conf
 - generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/syslog-haproxy.conf
 - generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/syslogd-default.conf
@@ -134,8 +143,8 @@ files:
 - generators/vulcanize/templates/minimal_mysql/templates.yml
 - generators/vulcanize/templates/minimal_nodb/templates.yml
 - generators/vulcanize/templates/mongrel/config/rubber/deploy-mongrel.rb
-- generators/vulcanize/templates/mongrel/config/rubber/role/app/mongrel_cluster.yml
-- generators/vulcanize/templates/mongrel/config/rubber/role/app/monit-mongrel.conf
+- generators/vulcanize/templates/mongrel/config/rubber/role/mongrel/mongrel_cluster.yml
+- generators/vulcanize/templates/mongrel/config/rubber/role/mongrel/monit-mongrel.conf
 - generators/vulcanize/templates/mongrel/config/rubber/rubber-mongrel.yml
 - generators/vulcanize/templates/mongrel/templates.yml
 - generators/vulcanize/templates/monit/config/rubber/common/monit-default.conf
@@ -179,16 +188,19 @@ files:
 - generators/vulcanize/templates/mysql_proxy/config/rubber/rubber-mysql_proxy.yml
 - generators/vulcanize/templates/mysql_proxy/templates.yml
 - generators/vulcanize/templates/nginx/config/rubber/deploy-nginx.rb
-- generators/vulcanize/templates/nginx/config/rubber/role/web/crontab
-- generators/vulcanize/templates/nginx/config/rubber/role/web/monit-nginx.conf
-- generators/vulcanize/templates/nginx/config/rubber/role/web/nginx.conf
-- generators/vulcanize/templates/nginx/config/rubber/role/web_tools/index.html
+- generators/vulcanize/templates/nginx/config/rubber/role/nginx/crontab
+- generators/vulcanize/templates/nginx/config/rubber/role/nginx/monit-nginx.conf
+- generators/vulcanize/templates/nginx/config/rubber/role/nginx/nginx.conf
 - generators/vulcanize/templates/nginx/config/rubber/role/web_tools/nginx-tools.conf
+- generators/vulcanize/templates/nginx/config/rubber/role/web_tools/tools-index.html
+- generators/vulcanize/templates/nginx/config/rubber/role/web_tools/tools-nginx.auth
 - generators/vulcanize/templates/nginx/config/rubber/rubber-nginx.yml
 - 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/role/passenger/munin-passenger-sudoers.conf
+- generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger.conf
+- generators/vulcanize/templates/passenger/config/rubber/role/passenger/passenger-apache-vhost.conf
+- generators/vulcanize/templates/passenger/config/rubber/role/passenger/passenger.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
@@ -217,6 +229,7 @@ files:
 - lib/rubber/recipes/rubber/bundles.rb
 - lib/rubber/recipes/rubber/deploy.rb
 - lib/rubber/recipes/rubber/instances.rb
+- lib/rubber/recipes/rubber/load_balancers.rb
 - lib/rubber/recipes/rubber/security_groups.rb
 - lib/rubber/recipes/rubber/setup.rb
 - lib/rubber/recipes/rubber/static_ips.rb
@@ -226,6 +239,7 @@ files:
 - lib/rubber/util.rb
 has_rdoc: false
 homepage: http://github.com/wr0ngway/rubber
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -246,7 +260,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)