rubber 1.1.2 → 1.1.3

data/CHANGELOG

@@ -1,3 +1,56 @@
+1.1.3
+-----
+
+use correct path for passenger when using enterprise ruby or not <20a8542> [Matt Conway]
+add ability to grab default roles from rubber.yml at instance creation time <8817d78> [Matt Conway]
+add gemcutter, simplify changelog <44d989b> [Matt Conway]
+update to latest 9.04 ami <5043937> [Matt Conway]
+initial redis module <bb3a6b2> [Matt Conway]
+monitor postfix <6303745> [Matt Conway]
+switch to gemcutter <aead58a> [Matt Conway]
+add changelog generation <06475d9> [Matt Conway]
+
+1.1.2
+-----
+
+fix ver <e32a665> [Matt Conway]
+fix ver <f5c5172> [Matt Conway]
+remove bad code <16306dc> [Matt Conway]
+
+1.1.1
+-----
+
+prevent reading from env before it is created (infinite loop) <b3255cb> [Matt Conway]
+fix gemcutter task <7372e7b> [Matt Conway]
+ignore gems <a879638> [Matt Conway]
+
+1.1.0
+-----
+
+add setup of arbitrary dns records via nettica or zerigo apis <61ca87e> [Matt Conway]
+command for backing up arbitrary directories <d984451> [Matt Conway]
+helper for installing rubber gems locally <51e926b> [Matt Conway]
+add lib for rails initiliazer, fix bad char in description for gemcutter, add task for pushing to gemcutter <0ab8d80> [Matt Conway]
+refactor dns classes to allow setting up other dns records from rubber.yml <937629c> [Matt Conway]
+add rails/init.rb to gemspec, automate gemcutter gem creation <c9c3e52> [Matt Conway]
+update REE to 1.8.7-20090928 <59888ec> [Matt Conway]
+add gemcutter source <ae8aabb> [Matt Conway]
+add forwarded ip address <735c9c7> [Matt Conway]
+Merge branch 'master' of git@github.com:wr0ngway/rubber <4b1159b> [Matt Conway]
+fix apache roles <83f602c> [Matt Conway]
+better error message for missing image on destroy <53e8cf2> [Matt Conway]
+don't check status when getting single host <d01a79c> [Matt Conway]
+fix bad encoding char for gemcutter <c5290c2> [Matt Conway]
+
+1.0.2
+-----
+
+add some error checking <ad2c6a3> [Matt Conway]
+add error msg for auth failure <7ca7bec> [Matt Conway]
+fix setting of ip in zerigo <8ca947a> [Matt Conway]
+more todos <a13e97a> [Matt Conway]
+version bump <6c80a34> [Matt Conway]
+
 1.0.1
 -----
 

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/generators/vulcanize/templates/base/config/rubber/common/monit-postfix.conf

@@ -0,0 +1,8 @@
+<%
+  @path = '/etc/monit/monit.d/monit-postfix.conf'
+%>
+
+check process postfix with pidfile /var/spool/postfix/pid/master.pid
+  start program  "/etc/init.d/postfix start"
+  stop program  "/etc/init.d/postfix stop"
+  if 5 restarts within 5 cycles then timeout

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

@@ -75,10 +75,10 @@ cloud_providers:
 
     # REQUIRED: the ami and instance type for creating instances
     # The Ubuntu images at http://alestic.com/ work well
-    # Ubuntu 9.04 Jaunty	base install	32-bit	2.6.21.7-2.fc8xen	ami-ed46a784
-    # Ubuntu 9.04 Jaunty	base install	64-bit	2.6.21.7-2.fc8xen	ami-5b46a732
+    # Ubuntu 9.04 Jaunty	base install	32-bit	2.6.21.7-2.fc8xen	ami-ccf615a5
+    # Ubuntu 9.04 Jaunty	base install	64-bit	2.6.21.7-2.fc8xen	ami-eef61587
     #
-    image_id: ami-ed46a784
+    image_id: ami-ccf615a5
     # m1.small or m1.large or m1.xlarge
     image_type: m1.small
 

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

@@ -9,7 +9,7 @@ namespace :rubber do
     
     task :custom_install, :roles => :passenger do
       rubber.sudo_script 'install_passenger', <<-ENDSCRIPT
-        if [[ -z `ls /usr/local/lib/ruby/gems/*/gems/passenger-#{rubber_env.passenger_version}/ext/apache2/mod_passenger.so 2> /dev/null` ]]; then
+        if [[ -z `ls #{rubber_env.passenger_lib} 2> /dev/null` ]]; then
           echo -en "\n\n\n\n" | passenger-install-apache2-module
         fi
       ENDSCRIPT

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

@@ -2,9 +2,9 @@
   @path = '/etc/apache2/mods-available/passenger.conf'
   @post = 'cd /etc/apache2/mods-enabled && ln -fs ../mods-available/passenger.conf'
 %>
-LoadModule passenger_module /usr/local/lib/ruby/gems/1.8/gems/passenger-<%= rubber_env.passenger_version %>/ext/apache2/mod_passenger.so
-PassengerRoot /usr/local/lib/ruby/gems/1.8/gems/passenger-<%= rubber_env.passenger_version %>
-PassengerRuby /usr/local/bin/ruby
+LoadModule passenger_module <%= rubber_env.passenger_lib %>
+PassengerRoot <%= rubber_env.passenger_root %>
+PassengerRuby <%= rubber_env.passenger_ruby %>
 PassengerUseGlobalQueue on
 
 PassengerMaxPoolSize <%= rubber_env.max_app_connections %>

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

@@ -1,4 +1,8 @@
 passenger_version: 2.2.5
+ruby_prefix: "#{use_enterprise_ruby ? '/usr/local' : '/usr'}"
+passenger_root: "#{ruby_prefix}/lib/ruby/gems/1.8/gems/passenger-#{passenger_version}"
+passenger_ruby: "#{ruby_prefix}/bin/ruby"
+passenger_lib: "#{passenger_root}/ext/apache2/mod_passenger.so"
 passenger_listen_port: 7000
 passenger_listen_ssl_port: 7001
 max_app_connections: 20

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

@@ -0,0 +1,36 @@
+
+namespace :rubber do
+
+  namespace :redis do
+
+    rubber.allow_optional_tasks(self)
+
+    after "rubber:install_packages", "rubber:redis:custom_install"
+
+    task :custom_install, :roles => :redis do
+      custom_package('http://ftp.us.debian.org/debian/pool/main/r/redis/', 'redis-server', '1.01-1', '! -x /usr/bin/redis-server')
+    end
+
+    desc "Stops the redis server"
+    task :stop, :roles => :redis, :on_error => :continue do
+      run "/etc/init.d/redis-server stop"
+    end
+
+    desc "Starts the redis server"
+    task :start, :roles => :redis do
+      run "/etc/init.d/redis-server start"
+    end
+
+    desc "Restarts the redis server"
+    task :restart, :roles => :redis do
+      run "/etc/init.d/redis-server restart"
+    end
+
+    desc "Reloads the redis server"
+    task :reload, :roles => :redis do
+      run "/etc/init.d/redis-server restart"
+    end
+
+  end
+
+end

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

@@ -0,0 +1,8 @@
+<%
+  @read_cmd = 'crontab -l'
+  @write_cmd = 'crontab -'
+  @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

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

@@ -0,0 +1,9 @@
+<%
+  @path = '/etc/monit/monit.d/monit-redis.conf'
+%>
+<% PIDFILE = "/var/run/redis.pid" %>
+check process redis with pidfile <%= PIDFILE %>
+  group redis-<%= RUBBER_ENV %>
+  start program = "/etc/init.d/redis-server start"
+  stop program = "/etc/init.d/redis-server stop"
+  if failed host <%= rubber_env.host %> port 6379 with timeout 10 seconds for 10 cycles then restart

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

@@ -0,0 +1,141 @@
+<%
+  @path = '/etc/redis/redis.conf'
+  @post = <<-SCRIPT
+    mkdir -p #{rubber_env.redis_db_dir}
+    chown -R redis:redis #{rubber_env.redis_db_dir}
+    /etc/init.d/redis-server restart
+  SCRIPT
+%>
+
+# Redis configuration file example
+
+# By default Redis does not run as a daemon. Use 'yes' if you need it.
+# Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
+daemonize yes
+
+# When run as a daemon, Redis write a pid file in /var/run/redis.pid by default.
+# You can specify a custom pid file location here.
+pidfile /var/run/redis.pid
+
+# Accept connections on the specified port, default is 6379
+port 6379
+
+# If you want you can bind a single interface, if the bind option is not
+# specified all the interfaces will listen for connections.
+#
+# bind 127.0.0.1
+
+# Close the connection after a client is idle for N seconds (0 to disable)
+timeout 300
+
+# Save the DB on disk:
+#
+#   save <seconds> <changes>
+#
+#   Will save the DB if both the given number of seconds and the given
+#   number of write operations against the DB occurred.
+#
+#   In the example below the behaviour will be to save:
+#   after 900 sec (15 min) if at least 1 key changed
+#   after 300 sec (5 min) if at least 10 keys changed
+#   after 60 sec if at least 10000 keys changed
+save 900 1
+save 300 10
+save 60 10000
+
+# The filename where to dump the DB
+dbfilename dump.rdb
+
+# For default save/load DB in/from the working directory
+# Note that you must specify a directory not a file name.
+dir <%= rubber_env.redis_db_dir %>
+
+# Set server verbosity to 'debug'
+# it can be one of:
+# debug (a lot of information, useful for development/testing)
+# notice (moderately verbose, what you want in production probably)
+# warning (only very important / critical messages are logged)
+loglevel notice
+
+# Specify the log file name. Also 'stdout' can be used to force
+# the demon to log on the standard output. Note that if you use standard
+# output for logging but daemonize, logs will be sent to /dev/null
+logfile /var/log/redis/redis-server.log
+
+# 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
+databases 16
+
+################################# REPLICATION #################################
+
+# Master-Slave replication. Use slaveof to make a Redis instance a copy of
+# another Redis server. Note that the configuration is local to the slave
+# so for example it is possible to configure the slave to save the DB with a
+# different interval, or to listen to another port, and so on.
+
+# slaveof <masterip> <masterport>
+
+################################## SECURITY ###################################
+
+# Require clients to issue AUTH <PASSWORD> before processing any other
+# commands.  This might be useful in environments in which you do not trust
+# others with access to the host running redis-server.
+#
+# This should stay commented out for backward compatibility and because most
+# people do not need auth (e.g. they run their own servers).
+
+# requirepass foobared
+
+################################### LIMITS ####################################
+
+# Set the max number of connected clients at the same time. By default there
+# is no limit, and it's up to the number of file descriptors the Redis process
+# is able to open. The special value '0' means no limts.
+# Once the limit is reached Redis will close all the new connections sending
+# an error 'max number of clients reached'.
+
+# maxclients 128
+
+# Don't use more memory than the specified amount of bytes.
+# When the memory limit is reached Redis will try to remove keys with an
+# EXPIRE set. It will try to start freeing keys that are going to expire
+# in little time and preserve keys with a longer time to live.
+# Redis will also try to remove objects from free lists if possible.
+#
+# If all this fails, Redis will start to reply with errors to commands
+# that will use more memory, like SET, LPUSH, and so on, and will continue
+# to reply to most read-only commands like GET.
+#
+# WARNING: maxmemory can be a good idea mainly if you want to use Redis as a
+# 'state' server or cache, not as a real DB. When Redis is used as a real
+# database the memory usage will grow over the weeks, it will be obvious if
+# it is going to use too much memory in the long run, and you'll have the time
+# to upgrade. With maxmemory after the limit is reached you'll start to get
+# errors for write operations, and this may even lead to DB inconsistency.
+
+# maxmemory <bytes>
+
+############################### 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
+
+# Use object sharing. Can save a lot of memory if you have many common
+# string in your dataset, but performs lookups against the shared objects
+# pool so it uses more CPU and can be a bit slower. Usually it's a good
+# idea.
+#
+# When object sharing is enabled (shareobjects yes) you can use
+# shareobjectspoolsize to control the size of the pool used in order to try
+# object sharing. A bigger pool size will lead to better sharing capabilities.
+# In general you want this value to be at least the double of the number of
+# very common strings you have in your dataset.
+#
+# WARNING: object sharing is experimental, don't enable this feature
+# in production before of Redis 1.0-stable. Still please try this feature in
+# your development environment so that we can test it better.
+shareobjects no
+shareobjectspoolsize 1024

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

@@ -0,0 +1,4 @@
+
+redis_db_dir: /mnt/redis
+
+gems: [redis]

data/generators/vulcanize/templates/redis/templates.yml

@@ -0,0 +1 @@
+description: The redis module

data/lib/rubber/recipes/rubber/instances.rb

@@ -5,7 +5,11 @@ namespace :rubber do
   DESC
   required_task :create do
     instance_alias = get_env('ALIAS', "Instance alias (e.g. web01)", true)
-    r = get_env('ROLES', "Instance roles (e.g. web,app,db:primary=true)", true)
+
+    env = rubber_cfg.environment.bind(nil, instance_alias)
+    default_roles = env.instance_roles
+    r = get_env("ROLES", "Instance roles (e.g. web,app,db:primary=true)", true, default_roles)
+
     if r == '*'
       instance_roles = rubber_cfg.environment.known_roles
       instance_roles = instance_roles.collect {|role| role == "db" ? "db:primary=true" : role }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubber
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
 - Matt Conway
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-06 00:00:00 -04:00
+date: 2009-11-02 00:00:00 -05:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,6 +103,7 @@ files:
 - generators/vulcanize/templates/base/Capfile
 - generators/vulcanize/templates/base/config/deploy.rb
 - generators/vulcanize/templates/base/config/rubber/common/crontab
+- generators/vulcanize/templates/base/config/rubber/common/monit-postfix.conf
 - generators/vulcanize/templates/base/config/rubber/common/profile.rc
 - generators/vulcanize/templates/base/config/rubber/deploy-setup.rb
 - generators/vulcanize/templates/base/config/rubber/rubber-dns.yml
@@ -205,6 +206,12 @@ files:
 - 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/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.conf
+- generators/vulcanize/templates/redis/config/rubber/rubber-redis.yml
+- generators/vulcanize/templates/redis/templates.yml
 - generators/vulcanize/templates/sphinx/config/rubber/common/sphinx.yml
 - generators/vulcanize/templates/sphinx/config/rubber/deploy-sphinx.rb
 - generators/vulcanize/templates/sphinx/config/rubber/role/sphinx/crontab
@@ -264,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rubber
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A capistrano plugin for managing multi-instance deployments to the cloud (ec2)