rubber 1.9.1 → 1.10.1

data/VERSION

@@ -1 +1 @@
-1.9.1
+1.10.1

data/generators/vulcanize/templates/apache/config/rubber/role/apache/monit-apache.conf

@@ -1,8 +1,7 @@
 <%
   @path = '/etc/monit/monit.d/monit-apache.conf'
 %>
-<% PIDFILE = "/var/run/apache2.pid" %>
-check process apache with pidfile <%= PIDFILE %>
+check process apache with pidfile /var/run/apache2.pid
   group apache-<%= RUBBER_ENV %>
   start program = "/usr/bin/env service apache2 start"
   stop program = "/usr/bin/env service apache2 stop"

data/generators/vulcanize/templates/base/config/rubber/deploy-setup.rb

@@ -6,7 +6,7 @@ namespace :rubber do
     before "rubber:setup_gem_sources", "rubber:base:install_rvm"
     task :install_rvm do
       rubber.sudo_script "install_rvm", <<-ENDSCRIPT
-        if [[ `rvm --version 2> /dev/null` == "" ]]; then
+        if [[ ! `rvm --version 2> /dev/null` =~ "#{rubber_env.rvm_version}" ]]; then
           echo "rvm_prefix=/usr/local/" > /etc/rvmrc
           echo "#{rubber_env.rvm_prepare}" > /etc/profile.d/rvm.sh
 
@@ -55,10 +55,26 @@ namespace :rubber do
       install_rvm_ruby_script = <<-ENDSCRIPT
         rvm_ver=$1
         if [[ ! `rvm list default 2> /dev/null` =~ "$rvm_ver" ]]; then
-          rvm install $rvm_ver
+          echo "RVM is compiling/installing ruby $rvm_ver, this may take a while"
+
+          nohup rvm install $rvm_ver &> /tmp/install_rvm_ruby.log &
+          sleep 1
+
+          while true; do
+            if ! ps ax | grep -q "[r]vm install"; then exit; fi
+            echo -n .
+            sleep 5
+          done
+
           # need to set default after using once or something in env is broken
           rvm use $rvm_ver &> /dev/null
           rvm use $rvm_ver --default
+
+          # Something flaky with $PATH having an entry for "bin" which breaks
+          # munin, the below seems to fix it
+          rvm use $rvm_ver
+          rvm repair environments
+          rvm use $rvm_ver
         fi
       ENDSCRIPT
       opts[:script_args] = '$CAPISTRANO:VAR$'

data/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml

@@ -12,7 +12,7 @@
 packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, zlib1g-dev, libssl-dev, libreadline5-dev, libxml2-dev]
 
 # REQUIRED: the version of rvm itself
-rvm_version: 1.1.3
+rvm_version: 1.2.6
 
 # REQUIRED: Set to the rvm version string for the ruby version you wish to use
 # Run "rvm list known" to see the list of possible options

data/generators/vulcanize/templates/base/config/rubber/rubber.yml

@@ -130,6 +130,10 @@ auto_security_groups: true
 # account, or even multiple apps
 isolate_security_groups: true
 
+# OPTIONAL: Prompts one to sync security group rules when the ones in amazon
+# differ from those in rubber
+prompt_for_security_group_sync: true
+
 # OPTIONAL: The packages to install on all instances
 # You can install a specific version of a package by using a sub-array of pkg, version
 # For example, packages: [[rake, 0.7.1], irb]

data/generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/monit-haproxy.conf

@@ -1,8 +1,7 @@
 <%
   @path = '/etc/monit/monit.d/monit-haproxy.conf'
 %>
-<% PIDFILE = "/var/run/haproxy.pid" %>
-check process haproxy with pidfile <%= PIDFILE %>
+check process haproxy with pidfile /var/run/haproxy.pid
   group haproxy-<%= RUBBER_ENV %>
   start program = "/usr/bin/env service haproxy start"
   stop program = "/usr/bin/env service haproxy stop"

data/generators/vulcanize/templates/jetty/config/rubber/role/jetty/monit-jetty.conf

@@ -1,8 +1,7 @@
 <%
   @path = '/etc/monit/monit.d/monit-jetty.conf'
 %>
-<% PIDFILE = "/var/run/jetty.pid" %>
-check process jetty with pidfile <%= PIDFILE %>
+check process jetty with pidfile /var/run/jetty.pid
   group jetty-<%= RUBBER_ENV %>
   start program = "<%= rubber_env.jetty_dir %>/bin/jetty.sh start"
   stop program = "<%= rubber_env.jetty_dir %>/bin/jetty.sh stop"

data/generators/vulcanize/templates/mongrel/config/rubber/role/mongrel/monit-mongrel.conf

@@ -4,17 +4,17 @@
 
 <% (0..(rubber_env.mongrel_count.to_i - 1)).each do |i| %>
 
-  <% PORT = rubber_env.mongrel_base_port + i %>
-  <% PIDFILE = "#{RUBBER_ROOT}/tmp/pids/mongrel.#{PORT}.pid" %>
-  check process mongrel-<%= PORT %> with pidfile <%= PIDFILE %>
+  <% port = rubber_env.mongrel_base_port + i %>
+  <% pidfile = "#{RUBBER_ROOT}/tmp/pids/mongrel.#{port}.pid" %>
+  check process mongrel-<%= port %> with pidfile <%= pidfile %>
     group mongrel-<%= RUBBER_ENV %>
-    start program = "/bin/sh -c 'cd <%= RUBBER_ROOT %> && PATH=<%= rubber_env.ruby_prefix %>/bin:/usr/local/bin:$PATH && mongrel_rails cluster::start --clean --only <%= PORT %>'"
+    start program = "/bin/sh -c 'cd <%= RUBBER_ROOT %> && PATH=<%= rubber_env.ruby_prefix %>/bin:/usr/local/bin:$PATH && mongrel_rails cluster::start --clean --only <%= port %>'"
     <%
     # Stop gracefully - monit waits for stop to complete (since below process exits immediately, it must
     # wait for pid to disappear) before trying to start
     %>
-    stop program = "/bin/sh -c 'cd <%= RUBBER_ROOT %> && PATH=<%= rubber_env.ruby_prefix %>/bin:/usr/local/bin:$PATH && mongrel_rails cluster::stop --clean --only <%= PORT %> && sleep 30 && mongrel_rails cluster::stop --clean --force --only <%= PORT %>'"
+    stop program = "/bin/sh -c 'cd <%= RUBBER_ROOT %> && PATH=<%= rubber_env.ruby_prefix %>/bin:/usr/local/bin:$PATH && mongrel_rails cluster::stop --clean --only <%= port %> && sleep 30 && mongrel_rails cluster::stop --clean --force --only <%= port %>'"
     if totalmem > 200.0 MB for 3 cycles then restart
     <%# monit needs to test on same same interface that mongrel is listening on (see mongrel_cluster.yml) %>
-    if failed host <%= rubber_env.host %> port <%= PORT %> protocol http with timeout 10 seconds for 10 cycles then restart
+    if failed host <%= rubber_env.host %> port <%= port %> protocol http with timeout 10 seconds for 10 cycles then restart
 <% end %>

data/generators/vulcanize/templates/nginx/config/rubber/role/nginx/monit-nginx.conf

@@ -1,8 +1,7 @@
 <%
   @path = '/etc/monit/monit.d/monit-nginx.conf'
 %>
-<% PIDFILE = "/var/run/nginx.pid" %>
-check process nginx with pidfile <%= PIDFILE %>
+check process nginx with pidfile /var/run/nginx.pid
   group nginx-<%= RUBBER_ENV %>
   start program = "/usr/bin/env service nginx start"
   stop program = "/usr/bin/env service nginx stop"

data/generators/vulcanize/templates/redis/config/rubber/role/redis/crontab

@@ -4,5 +4,12 @@
   @additive = ['# start-redis-crontab', '# end-redis-crontab']
 %>
 
-# backup redis DBs every hour
-0 * * * * BACKUP_DIR=/mnt/redis_backups BACKUP_NAME=redis BACKUP_CMD="tar -czf \%dir\%/redis_\%time_stamp\%.tgz <%= rubber_env.redis_db_dir %>" <%= RUBBER_ROOT %>/script/cron-rake rubber:backup
+<%
+  # Backup db every 3 hours to secondary db if available, else primary db
+  backup_redis_host = rubber_instances.for_role('redis_slave').first rescue nil
+  backup_redis_host ||= rubber_instances.for_role('redis_master').first
+  if backup_redis_host.name == rubber_env.host
+%>
+# Backup redis DBs every hour.
+0 * * * * BACKUP_DIR=/mnt/redis_backups BACKUP_NAME=redis BACKUP_CMD="nice zip -r \%dir\%/redis_\%time_stamp\%.zip <%= rubber_env.redis_db_dir %> -x \*temp\*.rdb" <%= RUBBER_ROOT %>/script/cron-rake rubber:backup
+<% end %>

data/generators/vulcanize/templates/redis/config/rubber/role/redis/monit-redis.conf

@@ -1,8 +1,7 @@
 <%
   @path = '/etc/monit/monit.d/monit-redis.conf'
 %>
-<% PIDFILE = "/var/run/redis.pid" %>
-check process redis with pidfile <%= PIDFILE %>
+check process redis with pidfile /var/run/redis.pid
   group redis-<%= RUBBER_ENV %>
   start program = "/etc/init.d/redis-server start"
   stop program = "/etc/init.d/redis-server stop"

data/generators/vulcanize/templates/redis/config/rubber/role/redis/redis-sysctl.conf

@@ -0,0 +1,7 @@
+<%
+  @path = "/etc/sysctl.d/60-redis.conf"
+  @post = "/usr/sbin/service procps start"
+%>
+
+# allows redis to bgsave when memory is tight
+vm.overcommit_memory=1

data/generators/vulcanize/templates/redis/config/rubber/role/redis/redis.conf

@@ -97,6 +97,11 @@ dbfilename dump.rdb
 # Note that you must specify a directory here, not a file name.
 dir <%= rubber_env.redis_db_dir %>
 
+<%-
+  redis_master = rubber_instances.for_role('redis_master').first
+
+  if rubber_instances[rubber_env.host].role_names.include?('redis_slave')
+%>
 ################################# REPLICATION #################################
 
 # Master-Slave replication. Use slaveof to make a Redis instance a copy of
@@ -106,12 +111,15 @@ dir <%= rubber_env.redis_db_dir %>
 #
 # slaveof <masterip> <masterport>
 
+slaveof <%= redis_master.name %> 6379
+
 # If the master is password protected (using the "requirepass" configuration
 # directive below) it is possible to tell the slave to authenticate before
 # starting the replication synchronization process, otherwise the master will
 # refuse the slave request.
 #
 # masterauth <master-password>
+<%- end %>
 
 ################################## SECURITY ###################################
 

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

@@ -4,6 +4,10 @@ redis_db_dir: /mnt/redis
 
 gems: [redis]
 
+role_dependencies:
+  redis_master: [redis]
+  redis_slave: [redis]
+
 roles:
   redis:
     packages: [redis-server]

data/generators/vulcanize/templates/resque/config/rubber/role/resque_web/monit-resque_web.conf

@@ -1,12 +1,12 @@
 <%
   @path = '/etc/monit/monit.d/monit-resque_web.conf'
 
-  PIDFILE = "/var/run/resque_web.pid"
-  start_program = "HOME=/root resque-web --pid-file #{PIDFILE} --port #{rubber_env.resque_web_port} --no-launch #{RUBBER_ROOT}/config/initializers/resque.rb"
-  stop_program  = "HOME=/root resque-web --pid-file #{PIDFILE} --kill"
+  pidfile = "/var/run/resque_web.pid"
+  start_program = "HOME=/root resque-web --pid-file #{pidfile} --port #{rubber_env.resque_web_port} --no-launch #{RUBBER_ROOT}/config/initializers/resque.rb"
+  stop_program  = "HOME=/root resque-web --pid-file #{pidfile} --kill"
 %>
 
-check process resque_web with pidfile <%= PIDFILE %>
+check process resque_web with pidfile <%= pidfile %>
   group resque_web
   start program = "/bin/bash -l -c '<%= start_program %>'"
   stop program = "/bin/bash -l -c '<%= stop_program %>'"

data/generators/vulcanize/templates/resque/config/rubber/role/resque_worker/monit-resque_worker.conf

@@ -4,13 +4,13 @@
 
 <% rubber_env.resque_workers.each_with_index do |worker, i| %>
   <%
-    PIDFILE = "#{RUBBER_ROOT}/tmp/pids/resque_worker_#{i}.pid"
+    pidfile = "#{RUBBER_ROOT}/tmp/pids/resque_worker_#{i}.pid"
 
     start_program = "/usr/bin/sudo -H -u #{rubber_env.app_user} bash -l -c 'cd #{RUBBER_ROOT} && ./script/resque_worker_management.rb start #{i}'"
     stop_program  = "/usr/bin/sudo -H -u #{rubber_env.app_user} bash -l -c 'cd #{RUBBER_ROOT} && ./script/resque_worker_management.rb stop #{i} TERM'"
   %>
 
-  check process resque_worker_<%= i %> with pidfile <%= PIDFILE %>
+  check process resque_worker_<%= i %> with pidfile <%= pidfile %>
     group resque_worker
     start program = "<%= start_program %>"
     stop program = "<%= stop_program %>"

data/generators/vulcanize/templates/sphinx/config/rubber/role/sphinx/monit-sphinx.conf

@@ -1,12 +1,12 @@
 <%
   @path = '/etc/monit/monit.d/monit-sphinx.conf'
 
-  PIDFILE = "#{RUBBER_ROOT}/log/searchd.#{RUBBER_ENV}.pid"
+  pidfile = "#{RUBBER_ROOT}/log/searchd.#{RUBBER_ENV}.pid"
   start_program = "cd #{RUBBER_ROOT} && rake ts:start"
   stop_program = "cd #{RUBBER_ROOT} && rake ts:stop"
 %>
 
-check process sphinx with pidfile <%= PIDFILE %>
+check process sphinx with pidfile <%= pidfile %>
   group sphinx-<%= RUBBER_ENV %>
   start program = "/usr/bin/sudo -H -u <%= rubber_env.app_user %> bash -l -c '<%= start_program %>'"
   stop program = "/usr/bin/sudo -H -u <%= rubber_env.app_user %> bash -l -c '<%= stop_program %>'"

data/lib/generators/vulcanize/templates/apache/config/rubber/role/apache/monit-apache.conf

@@ -1,8 +1,7 @@
 <%
   @path = '/etc/monit/monit.d/monit-apache.conf'
 %>
-<% PIDFILE = "/var/run/apache2.pid" %>
-check process apache with pidfile <%= PIDFILE %>
+check process apache with pidfile /var/run/apache2.pid
   group apache-<%= RUBBER_ENV %>
   start program = "/usr/bin/env service apache2 start"
   stop program = "/usr/bin/env service apache2 stop"

data/lib/generators/vulcanize/templates/base/config/rubber/deploy-setup.rb

@@ -6,7 +6,7 @@ namespace :rubber do
     before "rubber:setup_gem_sources", "rubber:base:install_rvm"
     task :install_rvm do
       rubber.sudo_script "install_rvm", <<-ENDSCRIPT
-        if [[ `rvm --version 2> /dev/null` == "" ]]; then
+        if [[ ! `rvm --version 2> /dev/null` =~ "#{rubber_env.rvm_version}" ]]; then
           echo "rvm_prefix=/usr/local/" > /etc/rvmrc
           echo "#{rubber_env.rvm_prepare}" > /etc/profile.d/rvm.sh
 
@@ -55,10 +55,26 @@ namespace :rubber do
       install_rvm_ruby_script = <<-ENDSCRIPT
         rvm_ver=$1
         if [[ ! `rvm list default 2> /dev/null` =~ "$rvm_ver" ]]; then
-          rvm install $rvm_ver
+          echo "RVM is compiling/installing ruby $rvm_ver, this may take a while"
+
+          nohup rvm install $rvm_ver &> /tmp/install_rvm_ruby.log &
+          sleep 1
+
+          while true; do
+            if ! ps ax | grep -q "[r]vm install"; then exit; fi
+            echo -n .
+            sleep 5
+          done
+
           # need to set default after using once or something in env is broken
           rvm use $rvm_ver &> /dev/null
           rvm use $rvm_ver --default
+
+          # Something flaky with $PATH having an entry for "bin" which breaks
+          # munin, the below seems to fix it
+          rvm use $rvm_ver
+          rvm repair environments
+          rvm use $rvm_ver
         fi
       ENDSCRIPT
       opts[:script_args] = '$CAPISTRANO:VAR$'

data/lib/generators/vulcanize/templates/base/config/rubber/rubber-rvm.yml

@@ -12,7 +12,7 @@
 packages: [build-essential, git-core, subversion, curl, autoconf, bison, ruby, zlib1g-dev, libssl-dev, libreadline5-dev, libxml2-dev]
 
 # REQUIRED: the version of rvm itself
-rvm_version: 1.1.3
+rvm_version: 1.2.6
 
 # REQUIRED: Set to the rvm version string for the ruby version you wish to use
 # Run "rvm list known" to see the list of possible options

data/lib/generators/vulcanize/templates/base/config/rubber/rubber.yml

@@ -130,6 +130,10 @@ auto_security_groups: true
 # account, or even multiple apps
 isolate_security_groups: true
 
+# OPTIONAL: Prompts one to sync security group rules when the ones in amazon
+# differ from those in rubber
+prompt_for_security_group_sync: true
+
 # OPTIONAL: The packages to install on all instances
 # You can install a specific version of a package by using a sub-array of pkg, version
 # For example, packages: [[rake, 0.7.1], irb]

data/lib/generators/vulcanize/templates/haproxy/config/rubber/role/haproxy/monit-haproxy.conf

@@ -1,8 +1,7 @@
 <%
   @path = '/etc/monit/monit.d/monit-haproxy.conf'
 %>
-<% PIDFILE = "/var/run/haproxy.pid" %>
-check process haproxy with pidfile <%= PIDFILE %>
+check process haproxy with pidfile /var/run/haproxy.pid
   group haproxy-<%= RUBBER_ENV %>
   start program = "/usr/bin/env service haproxy start"
   stop program = "/usr/bin/env service haproxy stop"

data/lib/generators/vulcanize/templates/jetty/config/rubber/role/jetty/monit-jetty.conf

@@ -1,8 +1,7 @@
 <%
   @path = '/etc/monit/monit.d/monit-jetty.conf'
 %>
-<% PIDFILE = "/var/run/jetty.pid" %>
-check process jetty with pidfile <%= PIDFILE %>
+check process jetty with pidfile /var/run/jetty.pid
   group jetty-<%= RUBBER_ENV %>
   start program = "<%= rubber_env.jetty_dir %>/bin/jetty.sh start"
   stop program = "<%= rubber_env.jetty_dir %>/bin/jetty.sh stop"

data/lib/generators/vulcanize/templates/mongrel/config/rubber/role/mongrel/monit-mongrel.conf

@@ -4,17 +4,17 @@
 
 <% (0..(rubber_env.mongrel_count.to_i - 1)).each do |i| %>
 
-  <% PORT = rubber_env.mongrel_base_port + i %>
-  <% PIDFILE = "#{RUBBER_ROOT}/tmp/pids/mongrel.#{PORT}.pid" %>
-  check process mongrel-<%= PORT %> with pidfile <%= PIDFILE %>
+  <% port = rubber_env.mongrel_base_port + i %>
+  <% pidfile = "#{RUBBER_ROOT}/tmp/pids/mongrel.#{port}.pid" %>
+  check process mongrel-<%= port %> with pidfile <%= pidfile %>
     group mongrel-<%= RUBBER_ENV %>
-    start program = "/bin/sh -c 'cd <%= RUBBER_ROOT %> && PATH=<%= rubber_env.ruby_prefix %>/bin:/usr/local/bin:$PATH && mongrel_rails cluster::start --clean --only <%= PORT %>'"
+    start program = "/bin/sh -c 'cd <%= RUBBER_ROOT %> && PATH=<%= rubber_env.ruby_prefix %>/bin:/usr/local/bin:$PATH && mongrel_rails cluster::start --clean --only <%= port %>'"
     <%
     # Stop gracefully - monit waits for stop to complete (since below process exits immediately, it must
     # wait for pid to disappear) before trying to start
     %>
-    stop program = "/bin/sh -c 'cd <%= RUBBER_ROOT %> && PATH=<%= rubber_env.ruby_prefix %>/bin:/usr/local/bin:$PATH && mongrel_rails cluster::stop --clean --only <%= PORT %> && sleep 30 && mongrel_rails cluster::stop --clean --force --only <%= PORT %>'"
+    stop program = "/bin/sh -c 'cd <%= RUBBER_ROOT %> && PATH=<%= rubber_env.ruby_prefix %>/bin:/usr/local/bin:$PATH && mongrel_rails cluster::stop --clean --only <%= port %> && sleep 30 && mongrel_rails cluster::stop --clean --force --only <%= port %>'"
     if totalmem > 200.0 MB for 3 cycles then restart
     <%# monit needs to test on same same interface that mongrel is listening on (see mongrel_cluster.yml) %>
-    if failed host <%= rubber_env.host %> port <%= PORT %> protocol http with timeout 10 seconds for 10 cycles then restart
+    if failed host <%= rubber_env.host %> port <%= port %> protocol http with timeout 10 seconds for 10 cycles then restart
 <% end %>

data/lib/generators/vulcanize/templates/nginx/config/rubber/role/nginx/monit-nginx.conf

@@ -1,8 +1,7 @@
 <%
   @path = '/etc/monit/monit.d/monit-nginx.conf'
 %>
-<% PIDFILE = "/var/run/nginx.pid" %>
-check process nginx with pidfile <%= PIDFILE %>
+check process nginx with pidfile /var/run/nginx.pid
   group nginx-<%= RUBBER_ENV %>
   start program = "/usr/bin/env service nginx start"
   stop program = "/usr/bin/env service nginx stop"

data/lib/generators/vulcanize/templates/redis/config/rubber/role/redis/crontab

@@ -4,5 +4,12 @@
   @additive = ['# start-redis-crontab', '# end-redis-crontab']
 %>
 
-# backup redis DBs every hour
-0 * * * * BACKUP_DIR=/mnt/redis_backups BACKUP_NAME=redis BACKUP_CMD="tar -czf \%dir\%/redis_\%time_stamp\%.tgz <%= rubber_env.redis_db_dir %>" <%= RUBBER_ROOT %>/script/cron-rake rubber:backup
+<%
+  # Backup db every 3 hours to secondary db if available, else primary db
+  backup_redis_host = rubber_instances.for_role('redis_slave').first rescue nil
+  backup_redis_host ||= rubber_instances.for_role('redis_master').first
+  if backup_redis_host.name == rubber_env.host
+%>
+# Backup redis DBs every hour.
+0 * * * * BACKUP_DIR=/mnt/redis_backups BACKUP_NAME=redis BACKUP_CMD="nice zip -r \%dir\%/redis_\%time_stamp\%.zip <%= rubber_env.redis_db_dir %> -x \*temp\*.rdb" <%= RUBBER_ROOT %>/script/cron-rake rubber:backup
+<% end %>

data/lib/generators/vulcanize/templates/redis/config/rubber/role/redis/monit-redis.conf

@@ -1,8 +1,7 @@
 <%
   @path = '/etc/monit/monit.d/monit-redis.conf'
 %>
-<% PIDFILE = "/var/run/redis.pid" %>
-check process redis with pidfile <%= PIDFILE %>
+check process redis with pidfile /var/run/redis.pid
   group redis-<%= RUBBER_ENV %>
   start program = "/etc/init.d/redis-server start"
   stop program = "/etc/init.d/redis-server stop"

data/lib/generators/vulcanize/templates/redis/config/rubber/role/redis/redis-sysctl.conf

@@ -0,0 +1,7 @@
+<%
+  @path = "/etc/sysctl.d/60-redis.conf"
+  @post = "/usr/sbin/service procps start"
+%>
+
+# allows redis to bgsave when memory is tight
+vm.overcommit_memory=1

data/lib/generators/vulcanize/templates/redis/config/rubber/role/redis/redis.conf

@@ -97,6 +97,11 @@ dbfilename dump.rdb
 # Note that you must specify a directory here, not a file name.
 dir <%= rubber_env.redis_db_dir %>
 
+<%-
+  redis_master = rubber_instances.for_role('redis_master').first
+
+  if rubber_instances[rubber_env.host].role_names.include?('redis_slave')
+%>
 ################################# REPLICATION #################################
 
 # Master-Slave replication. Use slaveof to make a Redis instance a copy of
@@ -106,12 +111,15 @@ dir <%= rubber_env.redis_db_dir %>
 #
 # slaveof <masterip> <masterport>
 
+slaveof <%= redis_master.name %> 6379
+
 # If the master is password protected (using the "requirepass" configuration
 # directive below) it is possible to tell the slave to authenticate before
 # starting the replication synchronization process, otherwise the master will
 # refuse the slave request.
 #
 # masterauth <master-password>
+<%- end %>
 
 ################################## SECURITY ###################################
 

data/lib/generators/vulcanize/templates/redis/config/rubber/rubber-redis.yml

@@ -4,6 +4,10 @@ redis_db_dir: /mnt/redis
 
 gems: [redis]
 
+role_dependencies:
+  redis_master: [redis]
+  redis_slave: [redis]
+
 roles:
   redis:
     packages: [redis-server]

data/lib/generators/vulcanize/templates/resque/config/rubber/role/resque_web/monit-resque_web.conf

@@ -1,12 +1,12 @@
 <%
   @path = '/etc/monit/monit.d/monit-resque_web.conf'
 
-  PIDFILE = "/var/run/resque_web.pid"
-  start_program = "HOME=/root resque-web --pid-file #{PIDFILE} --port #{rubber_env.resque_web_port} --no-launch #{RUBBER_ROOT}/config/initializers/resque.rb"
-  stop_program  = "HOME=/root resque-web --pid-file #{PIDFILE} --kill"
+  pidfile = "/var/run/resque_web.pid"
+  start_program = "HOME=/root resque-web --pid-file #{pidfile} --port #{rubber_env.resque_web_port} --no-launch #{RUBBER_ROOT}/config/initializers/resque.rb"
+  stop_program  = "HOME=/root resque-web --pid-file #{pidfile} --kill"
 %>
 
-check process resque_web with pidfile <%= PIDFILE %>
+check process resque_web with pidfile <%= pidfile %>
   group resque_web
   start program = "/bin/bash -l -c '<%= start_program %>'"
   stop program = "/bin/bash -l -c '<%= stop_program %>'"

data/lib/generators/vulcanize/templates/resque/config/rubber/role/resque_worker/monit-resque_worker.conf

@@ -4,13 +4,13 @@
 
 <% rubber_env.resque_workers.each_with_index do |worker, i| %>
   <%
-    PIDFILE = "#{RUBBER_ROOT}/tmp/pids/resque_worker_#{i}.pid"
+    pidfile = "#{RUBBER_ROOT}/tmp/pids/resque_worker_#{i}.pid"
 
     start_program = "/usr/bin/sudo -H -u #{rubber_env.app_user} bash -l -c 'cd #{RUBBER_ROOT} && ./script/resque_worker_management.rb start #{i}'"
     stop_program  = "/usr/bin/sudo -H -u #{rubber_env.app_user} bash -l -c 'cd #{RUBBER_ROOT} && ./script/resque_worker_management.rb stop #{i} TERM'"
   %>
 
-  check process resque_worker_<%= i %> with pidfile <%= PIDFILE %>
+  check process resque_worker_<%= i %> with pidfile <%= pidfile %>
     group resque_worker
     start program = "<%= start_program %>"
     stop program = "<%= stop_program %>"

data/lib/generators/vulcanize/templates/sphinx/config/rubber/role/sphinx/monit-sphinx.conf

@@ -1,12 +1,12 @@
 <%
   @path = '/etc/monit/monit.d/monit-sphinx.conf'
 
-  PIDFILE = "#{RUBBER_ROOT}/log/searchd.#{RUBBER_ENV}.pid"
+  pidfile = "#{RUBBER_ROOT}/log/searchd.#{RUBBER_ENV}.pid"
   start_program = "cd #{RUBBER_ROOT} && rake ts:start"
   stop_program = "cd #{RUBBER_ROOT} && rake ts:stop"
 %>
 
-check process sphinx with pidfile <%= PIDFILE %>
+check process sphinx with pidfile <%= pidfile %>
   group sphinx-<%= RUBBER_ENV %>
   start program = "/usr/bin/sudo -H -u <%= rubber_env.app_user %> bash -l -c '<%= start_program %>'"
   stop program = "/usr/bin/sudo -H -u <%= rubber_env.app_user %> bash -l -c '<%= stop_program %>'"

data/lib/rubber/cloud/aws.rb

@@ -243,11 +243,13 @@ module Rubber
           export RUBYLIB=/usr/lib/site_ruby/
           unset RUBYOPT
           nohup ec2-bundle-vol --batch -d /mnt -k #{ec2_pk_dest} -c #{ec2_cert_dest} -u #{@aws_env.account} -p #{image_name} -r #{arch} &> /tmp/ec2-bundle-vol.log &
+          sleep 1
+
           echo "Creating image from instance volume..."
           while true; do
             if ! ps ax | grep -q "[e]c2-bundle-vol"; then exit; fi
             echo -n .
-            sleep 1
+            sleep 5
           done
         CMD
 

data/lib/rubber/instance.rb

@@ -14,9 +14,14 @@ module Rubber
         @file = file
         @items = {}
         @artifacts = {'volumes' => {}, 'static_ips' => {}}
-        if ENV['FILTER']
-          @filters = ENV['FILTER'].split(/\s*,\s*/)
-        end
+
+        @filters = ENV['FILTER'].split(/\s*,\s*/) rescue []
+        @filters, @filters_negated = @filters.partition {|f| f !~ /^-/ }
+        @filters_negated = @filters_negated.collect {|f| f[1..-1] }
+
+        @filter_roles = ENV['FILTER_ROLES'].split(/\s*,\s*/) rescue []
+        @filter_roles, @filter_roles_negated = @filter_roles.partition {|f| f !~ /^-/ }
+        @filter_roles_negated = @filter_roles_negated.collect {|f| f[1..-1] }
 
         if File.exist?(@file)
           item_list = File.open(@file) { |f| YAML.load(f) }
@@ -50,7 +55,21 @@ module Rubber
       end
 
       def filtered()
-        @items.values.find_all {|ic| ! @filters || @filters.include?(ic.name)}
+        filtered_results = []
+
+        if @filters.size == 0 && @filter_roles.size == 0
+          filtered_results.concat(@items.values)
+        else
+          @items.values.each do |ic|
+              filtered_results << ic if @filters.include?(ic.name)
+              filtered_results << ic if ic.roles.any? {|r| @filter_roles.include?(r.name)}
+          end
+        end
+
+        filtered_results.delete_if {|ic| @filters_negated.include?(ic.name) }
+        filtered_results.delete_if {|ic| ic.roles.any? {|r| @filter_roles_negated.include?(r.name)} }
+
+        return filtered_results
       end
 
       def all_roles()

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

@@ -134,7 +134,14 @@ namespace :rubber do
             # logger.debug "Rule in sync: #{rule_map.inspect}"
           else
             # rules don't match, remove them from cloud and re-add below
-            answer = Capistrano::CLI.ui.ask("Rule '#{rule_map.inspect}' exists in cloud, but not locally, remove from cloud? [y/N]?: ")
+            answer = nil
+            msg = "Rule '#{rule_map.inspect}' exists in cloud, but not locally"
+            if rubber_env.prompt_for_security_group_sync
+              answer = Capistrano::CLI.ui.ask("#{msg}, remove from cloud? [y/N]: ")
+            else
+              logger.info(msg)
+            end
+            
             rule_map = Rubber::Util::symbolize_keys(rule_map)
             if rule_map[:source_group_name]
               cloud.remove_security_group_rule(group_name, nil, nil, nil, {:name => rule_map[:source_group_name], :account => rule_map[:source_group_account]})
@@ -160,7 +167,13 @@ namespace :rubber do
         end
       else
         # delete group
-        answer = Capistrano::CLI.ui.ask("Security group '#{group_name}' exists in cloud but not locally, remove from cloud? [y/N]: ")
+        answer = nil
+        msg = "Security group '#{group_name}' exists in cloud but not locally"
+        if rubber_env.prompt_for_security_group_sync
+          answer = Capistrano::CLI.ui.ask("#{msg}, remove from cloud? [y/N]: ")
+        else
+          logger.debug(msg)
+        end
         cloud.destroy_security_group(group_name) if answer =~ /^y/
       end
     end

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

@@ -183,14 +183,15 @@ namespace :rubber do
       task :_zero_partitions, :hosts => ic.external_ip do
         rubber.sudo_script 'zero_partitions', <<-ENDSCRIPT
           # zero out parition for performance (see amazon DevGuide)
-          echo "Zeroing out raid partitions to improve performance, this way take a while"
+          echo "Zeroing out raid partitions to improve performance, this may take a while"
           #{zero_script}
+          sleep 1
 
           echo "Waiting for partitions to zero out"
           while true; do
             if ! ps ax | grep -q "[d]d.*/dev/zero"; then exit; fi
             echo -n .
-            sleep 1
+            sleep 5
           done
         ENDSCRIPT
       end

data/test/environment_test.rb

@@ -127,18 +127,11 @@ class EnvironmentTest < Test::Unit::TestCase
   end
 
   def test_instances_in_expansion
-    instance = InstanceItem.new('host1', 'domain.com', [RoleItem.new('role1')], '')
-    instance.external_ip = "1.2.3.4"
-    instances = Instance.new(Tempfile.new('testforinstanceexpansion').path)
-    instances.add(instance)
-
-    File.expects(:exist?).returns(true)
-    YAML.expects(:load_file).returns({'var1' =>'"#{rubber_instances.for_role("role1").first.external_ip}"'})
-    Rubber::Configuration.expects(:rubber_instances).returns(instances)
-    env = Rubber::Configuration::Environment.new(nil)
-    e = env.bind()
-
-    assert_equal "\"1.2.3.4\"", e['var1']    
+    config = Rubber::Configuration::get_configuration('test', "#{File.dirname(__FILE__)}/fixtures/instance_expansion")
+    config.environment
+    e = config.environment.bind()
+    e.stubs(:rubber_instances).returns(config.instance)
+    assert_equal "50.1.1.1", e['var1']
   end
 
 end

data/test/instance_test.rb

@@ -25,9 +25,16 @@ class InstanceTest < Test::Unit::TestCase
     assert_equal @i4, @instance.for_role('role2', 'primary' => true).first, 'not finding correct instances for role'
   end
 
+  def test_unfiltered
+    ENV['FILTER'] = nil
+    ENV['FILTER_ROLES'] = nil
+    setup
+    assert_equal 4, @instance.filtered().size, 'should not filter for empty FILTER(_ROLES)'
+  end
+
+
   def test_filtered
-    assert_equal 4, @instance.filtered().size, 'should not filter for empty FILTER'
-    
+    ENV['FILTER_ROLES'] = nil
     ENV['FILTER'] = 'host1'
     setup
     assert_equal [@i1], @instance.filtered(), 'should have only filtered host'
@@ -35,7 +42,34 @@ class InstanceTest < Test::Unit::TestCase
     ENV['FILTER'] = 'host2 , host4'
     setup
     assert_equal [@i2, @i4], @instance.filtered(), 'should have only filtered hosts'
-    
+
+    ENV['FILTER'] = '-host2'
+    setup
+    assert_equal [@i1, @i3, @i4], @instance.filtered(), 'should not have negated hosts'
+
+    ENV['FILTER'] = 'host1,host2,-host2'
+    setup
+    assert_equal [@i1], @instance.filtered(), 'should not have negated hosts'
+
+    ENV['FILTER'] = '-host1'
+    ENV['FILTER_ROLES'] = 'role1'
+    setup
+    assert_equal [@i2], @instance.filtered(), 'should not have negated roles'
+  end
+
+  def test_filtered_roles
+    ENV['FILTER'] = nil
+    ENV['FILTER_ROLES'] = 'role1'
+    setup
+    assert_equal [@i1, @i2], @instance.filtered(), 'should have only filtered roles'
+
+    ENV['FILTER_ROLES'] = 'role1 , role2'
+    setup
+    assert_equal [@i1, @i2, @i3, @i4], @instance.filtered(), 'should have only filtered roles'
+
+    ENV['FILTER_ROLES'] = '-role1'
+    setup
+    assert_equal [@i3, @i4], @instance.filtered(), 'should not have negated roles'
   end
 
   def test_equality

data/test/zerigo_test.rb

@@ -13,7 +13,7 @@ class ZerigoTest < Test::Unit::TestCase
     env = Rubber::Configuration::Environment::BoundEnv.new({'dns_providers' => {'zerigo' => {'email' => 'foo@bar.com', 'token' => 'testtoken'}}}, nil, nil)
     @dns = Rubber::Dns::Zerigo.new(env)
     FakeWeb.register_uri(:get,
-                         "http://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/zones.xml",
+                         "https://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/zones.xml",
                          :body => fakeweb_fixture('zerigo/get_zones.xml'))
     @domain = "example1.com"
     @zone = ::Zerigo::DNS::Zone.find_or_create(@domain)
@@ -22,7 +22,7 @@ class ZerigoTest < Test::Unit::TestCase
   def test_find_records
     hosts_xml = fakeweb_fixture('zerigo/get_hosts.xml')
     FakeWeb.register_uri(:get,
-                         "http://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts.xml?zone_id=1",
+                         "https://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts.xml?zone_id=1",
                          :body => hosts_xml)
     records = @dns.find_host_records(:host => '*', :domain => 'example1.com')
     assert_equal 2, records.size
@@ -32,7 +32,7 @@ class ZerigoTest < Test::Unit::TestCase
     doc.root.elements.delete(1)
     hosts_xml_single = doc.to_s
     FakeWeb.register_uri(:get,
-                         "http://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts.xml?fqdn=example1.com&zone_id=1",
+                         "https://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts.xml?fqdn=example1.com&zone_id=1",
                          :body => hosts_xml_single)
     records = @dns.find_host_records(:host => '', :domain => 'example1.com')
     assert_equal 1, records.size
@@ -42,7 +42,7 @@ class ZerigoTest < Test::Unit::TestCase
     doc.root.elements.delete(2)
     hosts_xml_single = doc.to_s
     FakeWeb.register_uri(:get,
-                         "http://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts.xml?fqdn=host1.example1.com&zone_id=1",
+                         "https://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts.xml?fqdn=host1.example1.com&zone_id=1",
                          :body => hosts_xml_single)
     records = @dns.find_host_records(:host => 'host1', :domain => 'example1.com')
     assert_equal 1, records.size
@@ -62,10 +62,10 @@ class ZerigoTest < Test::Unit::TestCase
     params = {:host => 'host1', :domain => 'example1.com'}
 
     FakeWeb.register_uri(:get,
-                         "http://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts.xml?fqdn=host1.example1.com&zone_id=1",
+                         "https://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts.xml?fqdn=host1.example1.com&zone_id=1",
                          :body => fakeweb_fixture('zerigo/host1.xml'))
     FakeWeb.register_uri(:delete,
-                         "http://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts/1.xml",
+                         "https://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts/1.xml",
                          :body => "")
 
     @dns.destroy_host_record(params)
@@ -76,10 +76,10 @@ class ZerigoTest < Test::Unit::TestCase
     new = {:host => 'host1', :domain => 'example1.com', :data => "1.1.1.2"}
 
     FakeWeb.register_uri(:get,
-                         "http://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts.xml?fqdn=host1.example1.com&zone_id=1",
+                         "https://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts.xml?fqdn=host1.example1.com&zone_id=1",
                          :body => fakeweb_fixture('zerigo/host1.xml'))
     FakeWeb.register_uri(:post,
-                         "http://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts/1.xml",
+                         "https://foo%40bar.com:testtoken@ns.zerigo.com/api/1.1/hosts/1.xml",
                          :body => "")
 
     @dns.update_host_record(params, new)

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rubber
 version: !ruby/object:Gem::Version 
-  hash: 49
-  prerelease: false
-  segments: 
-  - 1
-  - 9
-  - 1
-  version: 1.9.1
+  prerelease: 
+  version: 1.10.1
 platform: ruby
 authors: 
 - Matt Conway
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -05:00
+date: 2011-02-17 00:00:00 -05:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 4
-        - 0
         version: 2.4.0
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        - 17
         version: 0.9.17
   type: :runtime
   version_requirements: *id002
@@ -58,9 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
@@ -72,9 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
@@ -249,6 +228,7 @@ files:
 - generators/vulcanize/templates/redis/config/rubber/deploy-redis.rb
 - generators/vulcanize/templates/redis/config/rubber/role/redis/crontab
 - generators/vulcanize/templates/redis/config/rubber/role/redis/monit-redis.conf
+- generators/vulcanize/templates/redis/config/rubber/role/redis/redis-sysctl.conf
 - generators/vulcanize/templates/redis/config/rubber/role/redis/redis.conf
 - generators/vulcanize/templates/redis/config/rubber/rubber-redis.yml
 - generators/vulcanize/templates/redis/templates.yml
@@ -424,6 +404,7 @@ files:
 - lib/generators/vulcanize/templates/redis/config/rubber/deploy-redis.rb
 - lib/generators/vulcanize/templates/redis/config/rubber/role/redis/crontab
 - lib/generators/vulcanize/templates/redis/config/rubber/role/redis/monit-redis.conf
+- lib/generators/vulcanize/templates/redis/config/rubber/role/redis/redis-sysctl.conf
 - lib/generators/vulcanize/templates/redis/config/rubber/role/redis/redis.conf
 - lib/generators/vulcanize/templates/redis/config/rubber/rubber-redis.yml
 - lib/generators/vulcanize/templates/redis/templates.yml
@@ -484,20 +465,14 @@ has_rdoc: true
 homepage: http://github.com/wr0ngway/rubber
 licenses: []
 
-post_install_message: |+
-  
-  ********************************************************************************
-  
-  Thank you for installing rubber.  Please note that this is a major upgrade
-  and we've moved towards using RVM for Ruby configuration on your EC2 instances.
-  
-  If you're upgrading rubber, please make sure to read the upgrade notes and
-  make the necessary configuration changes:
-  
-  http://wiki.github.com/wr0ngway/rubber/upgrading
-  
-  ********************************************************************************
-  
+post_install_message: "\n\
+  ********************************************************************************\n\n\
+  Thank you for installing rubber.  Please note that this is a major upgrade\n\
+  and we've moved towards using RVM for Ruby configuration on your EC2 instances.\n\n\
+  If you're upgrading rubber, please make sure to read the upgrade notes and\n\
+  make the necessary configuration changes:\n\n\
+  http://wiki.github.com/wr0ngway/rubber/upgrading\n\n\
+  ********************************************************************************\n\n"
 rdoc_options: []
 
 require_paths: 
@@ -507,23 +482,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rubber
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A capistrano plugin for managing multi-instance deployments to the cloud (ec2)