rubber 1.10.2 → 1.11.0

data/CHANGELOG

@@ -1,3 +1,14 @@
+1.10.2
+-----
+
+Regenerate gemspec for version 1.10.2 <4f49701> [Kevin Menard]
+Merge branch 'master' of github.com:wr0ngway/rubber <e32671f> [Kevin Menard]
+Fixed issue #41: rvm installation exits prematurely. <8a4bced> [Kevin Menard]
+Fixed issue #28: postgresql with password fails <97270e3> [Kevin Menard]
+fix file write for db restoration <51b1117> [Matt Conway]
+Bumped passenger version. <2547950> [Kevin Menard]
+Note that a release had been yanked. <d636389> [Kevin Menard]
+
 1.10.1
 -----
 

data/VERSION

@@ -1 +1 @@
-1.10.2
+1.11.0

data/generators/vulcanize/templates/base/Rakefile

@@ -2,22 +2,26 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-RAILS_LOADER
+if ARGV.grep(/rubber:/).empty?
+  RAILS_LOADER
 
-env = ENV['RUBBER_ENV'] ||= (ENV['RAILS_ENV'] || 'development')
-RAILS_ENV = ENV['RAILS_ENV'] = env
-root = File.dirname(__FILE__)
+  env = ENV['RUBBER_ENV'] ||= (ENV['RAILS_ENV'] || 'development')
+  RAILS_ENV = ENV['RAILS_ENV'] = env
+  root = File.dirname(__FILE__)
 
-require 'rubber'
+  require 'rubber'
 
-Rubber::initialize(root, env)
+  Rubber::initialize(root, env)
 
-require 'rubber/tasks/rubber'
+  require 'rubber/tasks/rubber'
 
-task :console do
-  ARGV.clear
-  require "irb"
-  IRB.start
-end
+  task :console do
+    ARGV.clear
+    require "irb"
+    IRB.start
+  end
 
-RAILS_TASKS
+  RAILS_TASKS
+else
+  load File.join(File.dirname(__FILE__), 'lib/tasks/rubber.rake')
+end

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

@@ -37,6 +37,8 @@ namespace :rubber do
 
           bash ./scripts/install
 
+          sed -i 's/rubygems_version=.*/rubygems_version=#{rubber_env.rubygems_version}/' #{rubber_env.rvm_prefix}/config/db
+
           #
           # end rvm install script
 

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

@@ -12,12 +12,16 @@
 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.2.6
+rvm_version: 1.2.7
 
 # 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
 rvm_ruby: 1.9.2
 
+# REQUIRED: Set to version of RubyGems you want RVM to install. Note that older RVMs do not
+# know about newer RubyGems.  So you may need to bump your rvm_version to get the latest RubyGems release.
+rubygems_version: 1.5.2
+
 # When rvm is installed as root, and you set the default, it symlinks ruby executables
 # into /usr/local/rvm
 ruby_prefix: /usr/local/rvm

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

@@ -80,7 +80,7 @@ namespace :rubber do
               logger.info "Creating slave from a dump of master #{source_host}"
               rubber.sudo_script "create_slave_db_from_master", <<-ENDSCRIPT
                 mysql -u root -e "change master to master_host='#{master_host}', master_user='#{env.db_replicator_user}' #{master_pass}"
-                mysqldump -u #{env.db_user} #{env.db_pass.nil? ? '' : '--password ' + env.db_pass} -h #{source_host} --all-databases --master-data=1 | mysql -u root
+                mysqldump -u #{env.db_user} #{env.db_pass.nil? ? '' : '--password=' + env.db_pass} -h #{source_host} --all-databases --master-data=1 | mysql -u root
               ENDSCRIPT
             else
               logger.info "Creating slave from a dump of slave #{source_host}"
@@ -90,7 +90,7 @@ namespace :rubber do
               log_file = slave_config['Master_Log_File']
               log_pos = slave_config['Read_Master_Log_Pos']
               rubber.sudo_script "create_slave_db_from_slave", <<-ENDSCRIPT
-                mysqldump -u #{env.db_user} --password #{env.db_pass} -h #{source_host} --all-databases --master-data=1 | mysql -u root
+                mysqldump -u #{env.db_user} #{env.db_pass.nil? ? '' : '--password=' + env.db_pass} -h #{source_host} --all-databases --master-data=1 | mysql -u root
                 mysql -u root -e "change master to master_host='#{master_host}', master_user='#{env.db_replicator_user}', master_log_file='#{log_file}', master_log_pos=#{log_pos} #{master_pass}"
                 mysql -u #{env.db_user} --password #{env.db_pass} -h #{source_host} -e "start slave;"
               ENDSCRIPT

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

@@ -1,4 +1,4 @@
-passenger_version: 3.0.2
+passenger_version: 3.0.4
 passenger_root: "#{rvm_gem_home}/gems/passenger-#{passenger_version}"
 passenger_ruby: "#{rvm_prefix}/wrappers/#{`bash -l -c 'rvm strings #{rvm_ruby}'`.strip}/ruby"
 passenger_lib: "#{passenger_root}/ext/apache2/mod_passenger.so"

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

@@ -26,11 +26,11 @@ namespace :rubber do
           # Install the binaries.
           /etc/init.d/redis-server stop
 
-          mv redis-benchmark /usr/bin/
-          mv redis-check-aof /usr/bin/
-          mv redis-check-dump /usr/bin/
-          mv redis-cli /usr/bin/
-          mv redis-server /usr/bin/
+          mv src/redis-benchmark /usr/bin/
+          mv src/redis-check-aof /usr/bin/
+          mv src/redis-check-dump /usr/bin/
+          mv src/redis-cli /usr/bin/
+          mv src/redis-server /usr/bin/
 
           /etc/init.d/redis-server start
 
@@ -49,6 +49,13 @@ namespace :rubber do
         mkdir -p #{rubber_env.redis_db_dir}
         chown -R redis:redis #{rubber_env.redis_db_dir}
       ENDSCRIPT
+
+      # After everything installed on machines, we need the source tree
+      # on hosts in order to run rubber:config for bootstrapping the db
+      rubber.update_code_for_bootstrap
+
+      # Gen just the conf for cassandra
+      rubber.run_config(:RUBBER_ENV => RUBBER_ENV, :FILE => "role/redis", :FORCE => true, :deploy_path => release_path)
     end
 
     desc "Stops the redis server"

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

@@ -29,7 +29,8 @@ daemonize yes
 # default. You can specify a custom pid file location here.
 pidfile /var/run/redis.pid
 
-# Accept connections on the specified port, default is 6379
+# Accept connections on the specified port, default is 6379.
+# If port 0 is specified Redis will not listen on a TCP socket.
 port 6379
 
 # If you want you can bind a single interface, if the bind option is not
@@ -37,6 +38,12 @@ port 6379
 #
 # bind 127.0.0.1
 
+# Specify the path for the unix socket that will be used to listen for
+# incoming connections. There is no default, so Redis will not listen
+# on a unix socket when not specified.
+#
+# unixsocket /tmp/redis.sock
+
 # Close the connection after a client is idle for N seconds (0 to disable)
 timeout 300
 
@@ -53,6 +60,16 @@ loglevel notice
 # output for logging but daemonize, logs will be sent to /dev/null
 logfile /var/log/redis/redis-server.log
 
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+# syslog-enabled no
+
+# Specify the syslog identity.
+# syslog-ident redis
+
+# Specify the syslog facility.  Must be USER or between LOCAL0-LOCAL7.
+# syslog-facility local0
+
 # Set the number of databases. The default database is DB 0, you can select
 # a different one on a per-connection basis using SELECT <dbid> where
 # dbid is a number between 0 and 'databases'-1
@@ -119,6 +136,20 @@ slaveof <%= redis_master.name %> 6379
 # refuse the slave request.
 #
 # masterauth <master-password>
+
+
+# When a slave lost the connection with the master, or when the replication
+# is still in progress, the slave can act in two different ways:
+#
+# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
+#    still reply to client requests, possibly with out of data data, or the
+#    data set may just be empty if this is the first synchronization.
+#
+# 2) if slave-serve-stale data is set to 'no' the slave will reply with
+#    an error "SYNC with master in progress" to all the kind of commands
+#    but to INFO and SLAVEOF.
+#
+slave-serve-stale-data yes
 <%- end %>
 
 ################################## SECURITY ###################################
@@ -136,6 +167,22 @@ slaveof <%= redis_master.name %> 6379
 #
 # requirepass foobared
 
+# Command renaming.
+#
+# It is possilbe to change the name of dangerous commands in a shared
+# environment. For instance the CONFIG command may be renamed into something
+# of hard to guess so that it will be still available for internal-use
+# tools but not available for general clients.
+#
+# Example:
+#
+# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
+#
+# It is also possilbe to completely kill a command renaming it into
+# an empty string:
+#
+# rename-command CONFIG ""
+
 ################################### LIMITS ####################################
 
 # Set the max number of connected clients at the same time. By default there
@@ -165,6 +212,37 @@ slaveof <%= redis_master.name %> 6379
 #
 # maxmemory <bytes>
 
+# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+# is reached? You can select among five behavior:
+# 
+# volatile-lru -> remove the key with an expire set using an LRU algorithm
+# allkeys-lru -> remove any key accordingly to the LRU algorithm
+# volatile-random -> remove a random key with an expire set
+# allkeys->random -> remove a random key, any key
+# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
+# noeviction -> don't expire at all, just return an error on write operations
+# 
+# Note: with all the kind of policies, Redis will return an error on write
+#       operations, when there are not suitable keys for eviction.
+#
+#       At the date of writing this commands are: set setnx setex append
+#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
+#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
+#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
+#       getset mset msetnx exec sort
+#
+# The default is:
+#
+# maxmemory-policy volatile-lru
+
+# LRU and minimal TTL algorithms are not precise algorithms but approximated
+# algorithms (in order to save memory), so you can select as well the sample
+# size to check. For instance for default Redis will check three keys and
+# pick the one that was used less recently, you can change the sample size
+# using the following configuration directive.
+#
+# maxmemory-samples 3
+
 ############################## APPEND ONLY MODE ###############################
 
 # By default Redis asynchronously dumps the dataset on disk. If you can live
@@ -212,6 +290,26 @@ appendonly no
 appendfsync everysec
 # appendfsync no
 
+# When the AOF fsync policy is set to always or everysec, and a background
+# saving process (a background save or AOF log background rewriting) is
+# performing a lot of I/O against the disk, in some Linux configurations
+# Redis may block too long on the fsync() call. Note that there is no fix for
+# this currently, as even performing fsync in a different thread will block
+# our synchronous write(2) call.
+#
+# In order to mitigate this problem it's possible to use the following option
+# that will prevent fsync() from being called in the main process while a
+# BGSAVE or BGREWRITEAOF is in progress.
+#
+# This means that while another child is saving the durability of Redis is
+# the same as "appendfsync none", that in pratical terms means that it is
+# possible to lost up to 30 seconds of log in the worst scenario (with the
+# default Linux settings).
+# 
+# If you have latency problems turn this to "yes". Otherwise leave it as
+# "no" that is the safest pick from the point of view of durability.
+no-appendfsync-on-rewrite no
+
 ################################ VIRTUAL MEMORY ###############################
 
 # Virtual Memory allows Redis to work with datasets bigger than the actual
@@ -285,17 +383,25 @@ vm-max-threads 4
 
 ############################### ADVANCED CONFIG ###############################
 
-# Glue small output buffers together in order to send small replies in a
-# single TCP packet. Uses a bit more CPU but most of the times it is a win
-# in terms of number of queries per second. Use 'yes' if unsure.
-glueoutputbuf yes
-
 # Hashes are encoded in a special way (much more memory efficient) when they
 # have at max a given numer of elements, and the biggest element does not
 # exceed a given threshold. You can configure this limits with the following
 # configuration directives.
-hash-max-zipmap-entries 64
-hash-max-zipmap-value 512
+hash-max-zipmap-entries 512
+hash-max-zipmap-value 64
+
+# Similarly to hashes, small lists are also encoded in a special way in order
+# to save a lot of space. The special representation is only used when
+# you are under the following limits:
+list-max-ziplist-entries 512
+list-max-ziplist-value 64
+
+# Sets have a special encoding in just one case: when a set is composed
+# of just strings that happens to be integers in radix 10 in the range
+# of 64 bit signed integers.
+# The following configuration setting sets the limit in the size of the
+# set in order to use this special memory saving encoding.
+set-max-intset-entries 512
 
 # Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
 # order to help rehashing the main Redis hash table (the one mapping top-level

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

@@ -1,4 +1,4 @@
-redis_server_version: 2.0.4
+redis_server_version: 2.2.1
 
 redis_db_dir: /mnt/redis
 

data/generators/vulcanize/templates/sphinx/config/rubber/common/sphinx.yml

@@ -12,7 +12,7 @@
 # pid file::              log/searchd.#{environment}.pid
 # searchd files::         db/sphinx/#{environment}/
 # address::               127.0.0.1
-# port::                  3312
+# port::                  9312
 # allow star::            false
 # min prefix length::     1
 # min infix length::      1

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

@@ -10,4 +10,4 @@ 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 %>'"
-  if failed host <%= rubber_env.host %> port 3312 with timeout 5 seconds for 5 cycles then restart
+  if failed host <%= rubber_env.host %> port 9312 with timeout 5 seconds for 5 cycles then restart

data/lib/generators/vulcanize/templates/base/Rakefile

@@ -2,22 +2,26 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-RAILS_LOADER
+if ARGV.grep(/rubber:/).empty?
+  RAILS_LOADER
 
-env = ENV['RUBBER_ENV'] ||= (ENV['RAILS_ENV'] || 'development')
-RAILS_ENV = ENV['RAILS_ENV'] = env
-root = File.dirname(__FILE__)
+  env = ENV['RUBBER_ENV'] ||= (ENV['RAILS_ENV'] || 'development')
+  RAILS_ENV = ENV['RAILS_ENV'] = env
+  root = File.dirname(__FILE__)
 
-require 'rubber'
+  require 'rubber'
 
-Rubber::initialize(root, env)
+  Rubber::initialize(root, env)
 
-require 'rubber/tasks/rubber'
+  require 'rubber/tasks/rubber'
 
-task :console do
-  ARGV.clear
-  require "irb"
-  IRB.start
-end
+  task :console do
+    ARGV.clear
+    require "irb"
+    IRB.start
+  end
 
-RAILS_TASKS
+  RAILS_TASKS
+else
+  load File.join(File.dirname(__FILE__), 'lib/tasks/rubber.rake')
+end

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

@@ -37,6 +37,8 @@ namespace :rubber do
 
           bash ./scripts/install
 
+          sed -i 's/rubygems_version=.*/rubygems_version=#{rubber_env.rubygems_version}/' #{rubber_env.rvm_prefix}/config/db
+
           #
           # end rvm install script
 

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

@@ -12,12 +12,16 @@
 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.2.6
+rvm_version: 1.2.7
 
 # 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
 rvm_ruby: 1.9.2
 
+# REQUIRED: Set to version of RubyGems you want RVM to install. Note that older RVMs do not
+# know about newer RubyGems.  So you may need to bump your rvm_version to get the latest RubyGems release.
+rubygems_version: 1.5.2
+
 # When rvm is installed as root, and you set the default, it symlinks ruby executables
 # into /usr/local/rvm
 ruby_prefix: /usr/local/rvm

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

@@ -80,7 +80,7 @@ namespace :rubber do
               logger.info "Creating slave from a dump of master #{source_host}"
               rubber.sudo_script "create_slave_db_from_master", <<-ENDSCRIPT
                 mysql -u root -e "change master to master_host='#{master_host}', master_user='#{env.db_replicator_user}' #{master_pass}"
-                mysqldump -u #{env.db_user} #{env.db_pass.nil? ? '' : '--password ' + env.db_pass} -h #{source_host} --all-databases --master-data=1 | mysql -u root
+                mysqldump -u #{env.db_user} #{env.db_pass.nil? ? '' : '--password=' + env.db_pass} -h #{source_host} --all-databases --master-data=1 | mysql -u root
               ENDSCRIPT
             else
               logger.info "Creating slave from a dump of slave #{source_host}"
@@ -90,7 +90,7 @@ namespace :rubber do
               log_file = slave_config['Master_Log_File']
               log_pos = slave_config['Read_Master_Log_Pos']
               rubber.sudo_script "create_slave_db_from_slave", <<-ENDSCRIPT
-                mysqldump -u #{env.db_user} --password #{env.db_pass} -h #{source_host} --all-databases --master-data=1 | mysql -u root
+                mysqldump -u #{env.db_user} #{env.db_pass.nil? ? '' : '--password=' + env.db_pass} -h #{source_host} --all-databases --master-data=1 | mysql -u root
                 mysql -u root -e "change master to master_host='#{master_host}', master_user='#{env.db_replicator_user}', master_log_file='#{log_file}', master_log_pos=#{log_pos} #{master_pass}"
                 mysql -u #{env.db_user} --password #{env.db_pass} -h #{source_host} -e "start slave;"
               ENDSCRIPT

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

@@ -1,4 +1,4 @@
-passenger_version: 3.0.2
+passenger_version: 3.0.4
 passenger_root: "#{rvm_gem_home}/gems/passenger-#{passenger_version}"
 passenger_ruby: "#{rvm_prefix}/wrappers/#{`bash -l -c 'rvm strings #{rvm_ruby}'`.strip}/ruby"
 passenger_lib: "#{passenger_root}/ext/apache2/mod_passenger.so"

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

@@ -26,11 +26,11 @@ namespace :rubber do
           # Install the binaries.
           /etc/init.d/redis-server stop
 
-          mv redis-benchmark /usr/bin/
-          mv redis-check-aof /usr/bin/
-          mv redis-check-dump /usr/bin/
-          mv redis-cli /usr/bin/
-          mv redis-server /usr/bin/
+          mv src/redis-benchmark /usr/bin/
+          mv src/redis-check-aof /usr/bin/
+          mv src/redis-check-dump /usr/bin/
+          mv src/redis-cli /usr/bin/
+          mv src/redis-server /usr/bin/
 
           /etc/init.d/redis-server start
 
@@ -49,6 +49,13 @@ namespace :rubber do
         mkdir -p #{rubber_env.redis_db_dir}
         chown -R redis:redis #{rubber_env.redis_db_dir}
       ENDSCRIPT
+
+      # After everything installed on machines, we need the source tree
+      # on hosts in order to run rubber:config for bootstrapping the db
+      rubber.update_code_for_bootstrap
+
+      # Gen just the conf for cassandra
+      rubber.run_config(:RUBBER_ENV => RUBBER_ENV, :FILE => "role/redis", :FORCE => true, :deploy_path => release_path)
     end
 
     desc "Stops the redis server"

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

@@ -29,7 +29,8 @@ daemonize yes
 # default. You can specify a custom pid file location here.
 pidfile /var/run/redis.pid
 
-# Accept connections on the specified port, default is 6379
+# Accept connections on the specified port, default is 6379.
+# If port 0 is specified Redis will not listen on a TCP socket.
 port 6379
 
 # If you want you can bind a single interface, if the bind option is not
@@ -37,6 +38,12 @@ port 6379
 #
 # bind 127.0.0.1
 
+# Specify the path for the unix socket that will be used to listen for
+# incoming connections. There is no default, so Redis will not listen
+# on a unix socket when not specified.
+#
+# unixsocket /tmp/redis.sock
+
 # Close the connection after a client is idle for N seconds (0 to disable)
 timeout 300
 
@@ -53,6 +60,16 @@ loglevel notice
 # output for logging but daemonize, logs will be sent to /dev/null
 logfile /var/log/redis/redis-server.log
 
+# To enable logging to the system logger, just set 'syslog-enabled' to yes,
+# and optionally update the other syslog parameters to suit your needs.
+# syslog-enabled no
+
+# Specify the syslog identity.
+# syslog-ident redis
+
+# Specify the syslog facility.  Must be USER or between LOCAL0-LOCAL7.
+# syslog-facility local0
+
 # Set the number of databases. The default database is DB 0, you can select
 # a different one on a per-connection basis using SELECT <dbid> where
 # dbid is a number between 0 and 'databases'-1
@@ -119,6 +136,20 @@ slaveof <%= redis_master.name %> 6379
 # refuse the slave request.
 #
 # masterauth <master-password>
+
+
+# When a slave lost the connection with the master, or when the replication
+# is still in progress, the slave can act in two different ways:
+#
+# 1) if slave-serve-stale-data is set to 'yes' (the default) the slave will
+#    still reply to client requests, possibly with out of data data, or the
+#    data set may just be empty if this is the first synchronization.
+#
+# 2) if slave-serve-stale data is set to 'no' the slave will reply with
+#    an error "SYNC with master in progress" to all the kind of commands
+#    but to INFO and SLAVEOF.
+#
+slave-serve-stale-data yes
 <%- end %>
 
 ################################## SECURITY ###################################
@@ -136,6 +167,22 @@ slaveof <%= redis_master.name %> 6379
 #
 # requirepass foobared
 
+# Command renaming.
+#
+# It is possilbe to change the name of dangerous commands in a shared
+# environment. For instance the CONFIG command may be renamed into something
+# of hard to guess so that it will be still available for internal-use
+# tools but not available for general clients.
+#
+# Example:
+#
+# rename-command CONFIG b840fc02d524045429941cc15f59e41cb7be6c52
+#
+# It is also possilbe to completely kill a command renaming it into
+# an empty string:
+#
+# rename-command CONFIG ""
+
 ################################### LIMITS ####################################
 
 # Set the max number of connected clients at the same time. By default there
@@ -165,6 +212,37 @@ slaveof <%= redis_master.name %> 6379
 #
 # maxmemory <bytes>
 
+# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory
+# is reached? You can select among five behavior:
+# 
+# volatile-lru -> remove the key with an expire set using an LRU algorithm
+# allkeys-lru -> remove any key accordingly to the LRU algorithm
+# volatile-random -> remove a random key with an expire set
+# allkeys->random -> remove a random key, any key
+# volatile-ttl -> remove the key with the nearest expire time (minor TTL)
+# noeviction -> don't expire at all, just return an error on write operations
+# 
+# Note: with all the kind of policies, Redis will return an error on write
+#       operations, when there are not suitable keys for eviction.
+#
+#       At the date of writing this commands are: set setnx setex append
+#       incr decr rpush lpush rpushx lpushx linsert lset rpoplpush sadd
+#       sinter sinterstore sunion sunionstore sdiff sdiffstore zadd zincrby
+#       zunionstore zinterstore hset hsetnx hmset hincrby incrby decrby
+#       getset mset msetnx exec sort
+#
+# The default is:
+#
+# maxmemory-policy volatile-lru
+
+# LRU and minimal TTL algorithms are not precise algorithms but approximated
+# algorithms (in order to save memory), so you can select as well the sample
+# size to check. For instance for default Redis will check three keys and
+# pick the one that was used less recently, you can change the sample size
+# using the following configuration directive.
+#
+# maxmemory-samples 3
+
 ############################## APPEND ONLY MODE ###############################
 
 # By default Redis asynchronously dumps the dataset on disk. If you can live
@@ -212,6 +290,26 @@ appendonly no
 appendfsync everysec
 # appendfsync no
 
+# When the AOF fsync policy is set to always or everysec, and a background
+# saving process (a background save or AOF log background rewriting) is
+# performing a lot of I/O against the disk, in some Linux configurations
+# Redis may block too long on the fsync() call. Note that there is no fix for
+# this currently, as even performing fsync in a different thread will block
+# our synchronous write(2) call.
+#
+# In order to mitigate this problem it's possible to use the following option
+# that will prevent fsync() from being called in the main process while a
+# BGSAVE or BGREWRITEAOF is in progress.
+#
+# This means that while another child is saving the durability of Redis is
+# the same as "appendfsync none", that in pratical terms means that it is
+# possible to lost up to 30 seconds of log in the worst scenario (with the
+# default Linux settings).
+# 
+# If you have latency problems turn this to "yes". Otherwise leave it as
+# "no" that is the safest pick from the point of view of durability.
+no-appendfsync-on-rewrite no
+
 ################################ VIRTUAL MEMORY ###############################
 
 # Virtual Memory allows Redis to work with datasets bigger than the actual
@@ -285,17 +383,25 @@ vm-max-threads 4
 
 ############################### ADVANCED CONFIG ###############################
 
-# Glue small output buffers together in order to send small replies in a
-# single TCP packet. Uses a bit more CPU but most of the times it is a win
-# in terms of number of queries per second. Use 'yes' if unsure.
-glueoutputbuf yes
-
 # Hashes are encoded in a special way (much more memory efficient) when they
 # have at max a given numer of elements, and the biggest element does not
 # exceed a given threshold. You can configure this limits with the following
 # configuration directives.
-hash-max-zipmap-entries 64
-hash-max-zipmap-value 512
+hash-max-zipmap-entries 512
+hash-max-zipmap-value 64
+
+# Similarly to hashes, small lists are also encoded in a special way in order
+# to save a lot of space. The special representation is only used when
+# you are under the following limits:
+list-max-ziplist-entries 512
+list-max-ziplist-value 64
+
+# Sets have a special encoding in just one case: when a set is composed
+# of just strings that happens to be integers in radix 10 in the range
+# of 64 bit signed integers.
+# The following configuration setting sets the limit in the size of the
+# set in order to use this special memory saving encoding.
+set-max-intset-entries 512
 
 # Active rehashing uses 1 millisecond every 100 milliseconds of CPU time in
 # order to help rehashing the main Redis hash table (the one mapping top-level

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

@@ -1,4 +1,4 @@
-redis_server_version: 2.0.4
+redis_server_version: 2.2.1
 
 redis_db_dir: /mnt/redis
 

data/lib/generators/vulcanize/templates/sphinx/config/rubber/common/sphinx.yml

@@ -12,7 +12,7 @@
 # pid file::              log/searchd.#{environment}.pid
 # searchd files::         db/sphinx/#{environment}/
 # address::               127.0.0.1
-# port::                  3312
+# port::                  9312
 # allow star::            false
 # min prefix length::     1
 # min infix length::      1

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

@@ -10,4 +10,4 @@ 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 %>'"
-  if failed host <%= rubber_env.host %> port 3312 with timeout 5 seconds for 5 cycles then restart
+  if failed host <%= rubber_env.host %> port 9312 with timeout 5 seconds for 5 cycles then restart

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

@@ -56,13 +56,21 @@ namespace :rubber do
   end
 
   desc <<-DESC
-    Shows the configured persistent volumes
+    Destroys the configured persistent volumes
   DESC
   required_task :destroy_volume do
     volume_id = get_env('VOLUME_ID', "Volume ID", true)
     destroy_volume(volume_id)
   end
 
+  desc <<-DESC
+    Detaches the configured persistent volumes
+  DESC
+  required_task :detach_volume do
+    volume_id = get_env('VOLUME_ID', "Volume ID", true)
+    detach_volume(volume_id)
+  end
+
   def create_volume(size, zone)
     volumeId = cloud.create_volume(size.to_s, zone)
     fatal "Failed to create volume" if volumeId.nil?
@@ -272,13 +280,13 @@ namespace :rubber do
 
       <<-ENDSCRIPT
         # Add the logical volume mount point to /etc/fstab.
-        if ! grep -q '#{volume['mount']}' /etc/fstab; then
+        if ! grep -q '#{volume['name']}' /etc/fstab; then
           if mount | grep -q '#{volume['mount']}'; then
             umount '#{volume['mount']}'
           fi
 
           mv /etc/fstab /etc/fstab.bak
-          cat /etc/fstab.bak | grep -v '#{volume['mount']}' > /etc/fstab
+          cat /etc/fstab.bak | grep -v '#{volume['mount']}\\b' > /etc/fstab
           echo '#{device_name} #{volume['mount']} #{volume['filesystem']} noatime 0 0 # rubber LVM volume' >> /etc/fstab
         fi
 
@@ -312,6 +320,10 @@ namespace :rubber do
         for device in #{physical_volumes.join(' ')}
         do
           if ! pvdisplay $device >> /dev/null 2>&1; then
+            if grep $device /etc/mtab; then
+              umount $device
+            fi
+
             pvcreate $device
 
             # See if the volume group already exists. If so, add the new physical volume to it.
@@ -333,8 +345,7 @@ namespace :rubber do
     _setup_lvm_group
   end
 
-  def destroy_volume(volume_id)
-
+  def detach_volume(volume_id)
     logger.info "Detaching volume #{volume_id}"
     cloud.detach_volume(volume_id) rescue logger.info("Volume was not attached")
 
@@ -348,16 +359,24 @@ namespace :rubber do
     end
     print "\n"
 
+    logger.info "Detaching volume #{volume_id} from rubber instances file"
+    rubber_instances.each do |ic|
+      ic.volumes.delete(volume_id) if ic.volumes
+    end
+    rubber_instances.save
+
+  end
+  
+  def destroy_volume(volume_id)
+    detach_volume(volume_id)
+
     logger.info "Deleting volume #{volume_id}"
     cloud.destroy_volume(volume_id)
 
     logger.info "Removing volume #{volume_id} from rubber instances file"
     artifacts = rubber_instances.artifacts
     artifacts['volumes'].delete_if {|k,v| v == volume_id}
-    rubber_instances.each do |ic|
-      ic.volumes.delete(volume_id) if ic.volumes
-    end
     rubber_instances.save
   end
-  
+
 end

data/lib/rubber/tasks/rubber.rb

@@ -176,7 +176,7 @@ namespace :rubber do
 
     user = get_env('DBUSER', true)
     pass = get_env('DBPASS')
-    pass = nil if pass.strip.size == 0
+    pass = nil if (pass.nil? || pass.strip.size == 0)
     host = get_env('DBHOST', true)
     name = get_env('DBNAME', true)
 

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 1
-  - 10
-  - 2
-  version: 1.10.2
+  - 11
+  - 0
+  version: 1.11.0
 platform: ruby
 authors: 
 - Matt Conway
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 -05:00
+date: 2011-03-04 00:00:00 -05:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -486,20 +486,7 @@ 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: 
 rdoc_options: []
 
 require_paths: 
@@ -525,7 +512,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubber
-rubygems_version: 1.5.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: A capistrano plugin for managing multi-instance deployments to the cloud (ec2)