rubber 1.14.1 → 1.15.0

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

@@ -1,5 +1,5 @@
 
-# REQUIRED: The credentials for creating/accessong your app's database
+# REQUIRED: The credentials for creating/accessing your app's database
 #
 db_user: "#{app_name[0,16]}"
 db_pass:
@@ -16,19 +16,19 @@ db_backup_cmd: "nice sudo -u postgres pg_dumpall -U postgres | gzip -c > %backup
 #           "rake rubber:restore_db_s3"
 #           This command will receive the data generated by db_backup_cmd via
 #           its standard input
-db_restore_cmd: "zcat - | psql -Uroot -h %host% %name%"
+db_restore_cmd: "zcat - | psql -U postgres -h %host% %name%"
 
 postgresql_ver: 9.0
 postgresql_conf_dir: "/etc/postgresql/#{postgresql_ver}/main"
-postgresql_data_dir: /mnt/postgresql/data
-postgresql_archive_dir: /mnt/postgresql/archive
+postgresql_data_dir: "/mnt/postgresql/#{postgresql_ver}/data"
+postgresql_archive_dir: "/mnt/postgresql/#{postgresql_ver}/archive"
 postgresql_pid_file: "/var/run/postgresql/#{postgresql_ver}-main.pid"
 postgresql_ctl: "/usr/bin/env service postgresql"
 
 # Capistrano needs db:primary role for migrate to work,
 # so we might as well just make consistent across the board
 role_dependencies:
-  postgresql_master: [db:primary=true]
+  postgresql_master: ["db:primary=true"]
   postgresql_slave: [db]
   db:primary=true: [postgresql_master]
   db: [postgresql_slave]

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

@@ -7,7 +7,12 @@ namespace :rubber do
     before "rubber:install_packages", "rubber:redis:setup_apt_sources"
 
     task :setup_apt_sources, :roles => :redis do
-      rsudo "add-apt-repository ppa:soren/nova"
+      rubber.sudo_script 'configure_redis_repository', <<-ENDSCRIPT
+        # redis 2.0 is the default starting in Ubuntu 11.04.
+        if grep '10\.' /etc/lsb-release; then
+          add-apt-repository ppa:soren/nova
+        fi
+      ENDSCRIPT
     end
 
     after "rubber:install_packages", "rubber:redis:custom_install"

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

@@ -1,4 +1,4 @@
-redis_server_version: 2.2.8
+redis_server_version: 2.2.13
 
 redis_db_dir: /mnt/redis
 

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

@@ -27,6 +27,19 @@ namespace :rubber do
       task :restart, :roles => :resque_worker do
         rsudo "cd #{current_path} && RUBBER_ENV=#{rails_env} ./script/resque_worker_management.rb restart", :as => rubber_env.app_user
       end
+
+      # pauses deploy until all workers up so monit doesn't try and start them
+      before "rubber:monit:start", "rubber:resque:worker:wait_start"
+      task :wait_start, :roles => :resque_worker do
+        logger.info "Waiting for resque worker pid files to show up"
+
+        opts = get_host_options('resque_workers') do |worker_cfg|
+          worker_cfg.size.to_s
+        end
+
+        run "while ((`ls #{current_path}/tmp/pids/resque_worker_*.pid 2> /dev/null | wc -l` < $CAPISTRANO:VAR$)); do sleep 1; done", opts
+      end
+      
     end
 
     namespace :web do
@@ -38,12 +51,12 @@ namespace :rubber do
 
       desc "Starts resque web tools"
       task :start, :roles => :resque_web do
-        rsudo "RAILS_ENV=#{RUBBER_ENV} resque-web --pid-file /var/run/resque_web.pid --port #{rubber_env.resque_web_port} --no-launch #{current_path}/config/initializers/resque.rb"
+        rsudo "RAILS_ENV=#{RUBBER_ENV} resque-web --pid-file #{Rubber.root}/tmp/pids/resque_web.pid --port #{rubber_env.resque_web_port} --no-launch #{current_path}/config/initializers/resque.rb", :as => rubber_env.app_user
       end
 
       desc "Stops resque web tools"
       task :stop, :roles => :resque_web do
-        rsudo "RAILS_ENV=#{RUBBER_ENV} resque-web --pid-file /var/run/resque_web.pid --kill"
+        rsudo "RAILS_ENV=#{RUBBER_ENV} resque-web --pid-file #{Rubber.root}/tmp/pids/resque_web.pid --kill", :as => rubber_env.app_user
       end
 
       desc "Restarts resque web tools"

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

@@ -1,7 +1,7 @@
 <%
   @path = '/etc/monit/monit.d/monit-resque_web.conf'
 
-  pidfile = "/var/run/resque_web.pid"
+  pidfile = "#{Rubber.root}/tmp/pids/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"
 %>

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

@@ -5,10 +5,10 @@ resque_web_port: 5678
 #
 resque_workers:
   -
-    queues: *
+    queues: "*"
     poll_interval: 1
   -
-    queues: *
+    queues: "*"
     poll_interval: 1
 
 gems: [yajl-ruby resque]

data/lib/rubber/dns/zerigo.rb

@@ -4,7 +4,7 @@ begin
   require 'zerigo_dns'
 rescue LoadError
   puts "Missing the zerigo_dns gem.  Install with `sudo gem install zerigo_dns`."
-  exit(-1)
+  raise
 end
 
 module Rubber

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

@@ -189,7 +189,7 @@ namespace :rubber do
     delim = "#{delim} #{RUBBER_ENV}"
     remote_hosts = delim + "\n"
     rubber_instances.each do |ic|
-      hosts_data = [ic.name, ic.full_name, ic.external_host, ic.internal_host].join(' ')
+      hosts_data = [ic.full_name, ic.name, ic.external_host, ic.internal_host].join(' ')
       remote_hosts << ic.internal_ip << ' ' << hosts_data << "\n"
     end
     remote_hosts << delim << "\n"

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

@@ -129,7 +129,7 @@ namespace :rubber do
 	      else
 		 device='#{vol_spec['device']}'
 	      fi
-		 echo "$device #{vol_spec['mount']} #{vol_spec['filesystem']} noatime 0 0 # rubber volume #{vol_id}" >> /etc/fstab		
+		 echo "$device #{vol_spec['mount']} #{vol_spec['filesystem']} #{vol_spec['mount_opts'] ? vol_spec['mount_opts'] : 'noatime'} 0 0 # rubber volume #{vol_id}" >> /etc/fstab
 
               #{('yes | mkfs -t ' + vol_spec['filesystem'] + ' ' + '$device') if created}
               #{("mkdir -p '#{vol_spec['mount']}'") if vol_spec['mount']}
@@ -227,7 +227,7 @@ namespace :rubber do
           fi
           mv /etc/fstab /etc/fstab.bak
           cat /etc/fstab.bak | grep -vE '#{raid_spec['device']}|#{raid_spec['mount']}' > /etc/fstab
-          echo '#{raid_spec['device']} #{raid_spec['mount']} #{raid_spec['filesystem']} noatime 0 0 # rubber raid volume' >> /etc/fstab
+          echo '#{raid_spec['device']} #{raid_spec['mount']} #{raid_spec['filesystem']} #{vol_spec['mount_opts'] ? vol_spec['mount_opts'] : 'noatime'} 0 0 # rubber raid volume' >> /etc/fstab
 
           # seems to help devices initialize, otherwise mdadm fails because
           # device not ready even though ec2 says the volume is attached
@@ -292,7 +292,7 @@ namespace :rubber do
 
           mv /etc/fstab /etc/fstab.bak
           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
+          echo '#{device_name} #{volume['mount']} #{volume['filesystem']} #{vol_spec['mount_opts'] ? vol_spec['mount_opts'] : 'noatime'} 0 0 # rubber LVM volume' >> /etc/fstab
         fi
 
         # Check if the logical volume exists or not.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubber
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: 
   segments: 
   - 1
-  - 14
-  - 1
-  version: 1.14.1
+  - 15
+  - 0
+  version: 1.15.0
 platform: ruby
 authors: 
 - Matt Conway
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-02 00:00:00 -04:00
+date: 2011-09-13 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +112,7 @@ files:
 - 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/rsyslog.conf
 - generators/vulcanize/templates/base/config/rubber/common/rubber.profile
 - generators/vulcanize/templates/base/config/rubber/deploy-setup.rb
 - generators/vulcanize/templates/base/config/rubber/deploy-util.rb
@@ -140,6 +141,12 @@ files:
 - generators/vulcanize/templates/complete_passenger/templates.rb
 - generators/vulcanize/templates/complete_passenger/templates.yml
 - generators/vulcanize/templates/complete_passenger_mysql/templates.yml
+- generators/vulcanize/templates/complete_passenger_nginx/config/rubber/role/haproxy/haproxy-passenger.conf
+- generators/vulcanize/templates/complete_passenger_nginx/config/rubber/rubber-complete.yml
+- generators/vulcanize/templates/complete_passenger_nginx/templates.rb
+- generators/vulcanize/templates/complete_passenger_nginx/templates.yml
+- generators/vulcanize/templates/complete_passenger_nginx_mysql/templates.yml
+- generators/vulcanize/templates/complete_passenger_nginx_postgresql/templates.yml
 - generators/vulcanize/templates/complete_passenger_postgresql/templates.yml
 - generators/vulcanize/templates/cruise/config/rubber/deploy-cruise.rb
 - generators/vulcanize/templates/cruise/config/rubber/role/cruise/cruise
@@ -172,6 +179,8 @@ files:
 - generators/vulcanize/templates/memcached/templates.yml
 - generators/vulcanize/templates/minimal_mysql/templates.yml
 - generators/vulcanize/templates/minimal_nodb/templates.yml
+- generators/vulcanize/templates/minimal_passenger_nginx/config/rubber/rubber-complete.yml
+- generators/vulcanize/templates/minimal_passenger_nginx/templates.yml
 - generators/vulcanize/templates/mongodb/config/rubber/deploy-mongodb.rb
 - generators/vulcanize/templates/mongodb/config/rubber/role/mongodb/mongodb.conf
 - generators/vulcanize/templates/mongodb/config/rubber/role/mongodb/monit-mongodb.cnf
@@ -241,6 +250,21 @@ 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/passenger_nginx/config/rubber/deploy-passenger_nginx.rb
+- generators/vulcanize/templates/passenger_nginx/config/rubber/role/passenger_nginx/application.conf
+- generators/vulcanize/templates/passenger_nginx/config/rubber/role/passenger_nginx/crontab
+- generators/vulcanize/templates/passenger_nginx/config/rubber/role/passenger_nginx/monit-nginx.conf
+- generators/vulcanize/templates/passenger_nginx/config/rubber/role/passenger_nginx/munin-passenger-memory.conf
+- generators/vulcanize/templates/passenger_nginx/config/rubber/role/passenger_nginx/munin-passenger-sudoers.conf
+- generators/vulcanize/templates/passenger_nginx/config/rubber/role/passenger_nginx/munin-passenger.conf
+- generators/vulcanize/templates/passenger_nginx/config/rubber/role/passenger_nginx/nginx
+- generators/vulcanize/templates/passenger_nginx/config/rubber/role/passenger_nginx/nginx.conf
+- generators/vulcanize/templates/passenger_nginx/config/rubber/role/passenger_nginx/passenger_nginx.conf
+- generators/vulcanize/templates/passenger_nginx/config/rubber/role/web_tools/nginx-tools.conf
+- generators/vulcanize/templates/passenger_nginx/config/rubber/role/web_tools/tools-index.html
+- generators/vulcanize/templates/passenger_nginx/config/rubber/role/web_tools/tools-nginx.auth
+- generators/vulcanize/templates/passenger_nginx/config/rubber/rubber-passenger_nginx.yml
+- generators/vulcanize/templates/passenger_nginx/templates.yml
 - generators/vulcanize/templates/postgresql/config/rubber/common/database.yml
 - generators/vulcanize/templates/postgresql/config/rubber/deploy-postgresql.rb
 - generators/vulcanize/templates/postgresql/config/rubber/role/db/crontab
@@ -249,6 +273,7 @@ files:
 - generators/vulcanize/templates/postgresql/config/rubber/role/db/pg_hba.conf
 - generators/vulcanize/templates/postgresql/config/rubber/role/db/postgresql-sysctl.conf
 - generators/vulcanize/templates/postgresql/config/rubber/role/db/postgresql.conf
+- generators/vulcanize/templates/postgresql/config/rubber/role/postgresql_slave/recovery.conf
 - generators/vulcanize/templates/postgresql/config/rubber/rubber-postgresql.yml
 - generators/vulcanize/templates/postgresql/templates.yml
 - generators/vulcanize/templates/redis/config/rubber/deploy-redis.rb
@@ -293,6 +318,7 @@ files:
 - lib/generators/vulcanize/templates/base/config/deploy.rb
 - lib/generators/vulcanize/templates/base/config/rubber/common/crontab
 - lib/generators/vulcanize/templates/base/config/rubber/common/monit-postfix.conf
+- lib/generators/vulcanize/templates/base/config/rubber/common/rsyslog.conf
 - lib/generators/vulcanize/templates/base/config/rubber/common/rubber.profile
 - lib/generators/vulcanize/templates/base/config/rubber/deploy-setup.rb
 - lib/generators/vulcanize/templates/base/config/rubber/deploy-util.rb
@@ -321,6 +347,12 @@ files:
 - lib/generators/vulcanize/templates/complete_passenger/templates.rb
 - lib/generators/vulcanize/templates/complete_passenger/templates.yml
 - lib/generators/vulcanize/templates/complete_passenger_mysql/templates.yml
+- lib/generators/vulcanize/templates/complete_passenger_nginx/config/rubber/role/haproxy/haproxy-passenger.conf
+- lib/generators/vulcanize/templates/complete_passenger_nginx/config/rubber/rubber-complete.yml
+- lib/generators/vulcanize/templates/complete_passenger_nginx/templates.rb
+- lib/generators/vulcanize/templates/complete_passenger_nginx/templates.yml
+- lib/generators/vulcanize/templates/complete_passenger_nginx_mysql/templates.yml
+- lib/generators/vulcanize/templates/complete_passenger_nginx_postgresql/templates.yml
 - lib/generators/vulcanize/templates/complete_passenger_postgresql/templates.yml
 - lib/generators/vulcanize/templates/cruise/config/rubber/deploy-cruise.rb
 - lib/generators/vulcanize/templates/cruise/config/rubber/role/cruise/cruise
@@ -353,6 +385,8 @@ files:
 - lib/generators/vulcanize/templates/memcached/templates.yml
 - lib/generators/vulcanize/templates/minimal_mysql/templates.yml
 - lib/generators/vulcanize/templates/minimal_nodb/templates.yml
+- lib/generators/vulcanize/templates/minimal_passenger_nginx/config/rubber/rubber-complete.yml
+- lib/generators/vulcanize/templates/minimal_passenger_nginx/templates.yml
 - lib/generators/vulcanize/templates/mongodb/config/rubber/deploy-mongodb.rb
 - lib/generators/vulcanize/templates/mongodb/config/rubber/role/mongodb/mongodb.conf
 - lib/generators/vulcanize/templates/mongodb/config/rubber/role/mongodb/monit-mongodb.cnf
@@ -422,6 +456,21 @@ files:
 - lib/generators/vulcanize/templates/passenger/config/rubber/role/passenger/passenger.conf
 - lib/generators/vulcanize/templates/passenger/config/rubber/rubber-passenger.yml
 - lib/generators/vulcanize/templates/passenger/templates.yml
+- lib/generators/vulcanize/templates/passenger_nginx/config/rubber/deploy-passenger_nginx.rb
+- lib/generators/vulcanize/templates/passenger_nginx/config/rubber/role/passenger_nginx/application.conf
+- lib/generators/vulcanize/templates/passenger_nginx/config/rubber/role/passenger_nginx/crontab
+- lib/generators/vulcanize/templates/passenger_nginx/config/rubber/role/passenger_nginx/monit-nginx.conf
+- lib/generators/vulcanize/templates/passenger_nginx/config/rubber/role/passenger_nginx/munin-passenger-memory.conf
+- lib/generators/vulcanize/templates/passenger_nginx/config/rubber/role/passenger_nginx/munin-passenger-sudoers.conf
+- lib/generators/vulcanize/templates/passenger_nginx/config/rubber/role/passenger_nginx/munin-passenger.conf
+- lib/generators/vulcanize/templates/passenger_nginx/config/rubber/role/passenger_nginx/nginx
+- lib/generators/vulcanize/templates/passenger_nginx/config/rubber/role/passenger_nginx/nginx.conf
+- lib/generators/vulcanize/templates/passenger_nginx/config/rubber/role/passenger_nginx/passenger_nginx.conf
+- lib/generators/vulcanize/templates/passenger_nginx/config/rubber/role/web_tools/nginx-tools.conf
+- lib/generators/vulcanize/templates/passenger_nginx/config/rubber/role/web_tools/tools-index.html
+- lib/generators/vulcanize/templates/passenger_nginx/config/rubber/role/web_tools/tools-nginx.auth
+- lib/generators/vulcanize/templates/passenger_nginx/config/rubber/rubber-passenger_nginx.yml
+- lib/generators/vulcanize/templates/passenger_nginx/templates.yml
 - lib/generators/vulcanize/templates/postgresql/config/rubber/common/database.yml
 - lib/generators/vulcanize/templates/postgresql/config/rubber/deploy-postgresql.rb
 - lib/generators/vulcanize/templates/postgresql/config/rubber/role/db/crontab
@@ -430,6 +479,7 @@ files:
 - lib/generators/vulcanize/templates/postgresql/config/rubber/role/db/pg_hba.conf
 - lib/generators/vulcanize/templates/postgresql/config/rubber/role/db/postgresql-sysctl.conf
 - lib/generators/vulcanize/templates/postgresql/config/rubber/role/db/postgresql.conf
+- lib/generators/vulcanize/templates/postgresql/config/rubber/role/postgresql_slave/recovery.conf
 - lib/generators/vulcanize/templates/postgresql/config/rubber/rubber-postgresql.yml
 - lib/generators/vulcanize/templates/postgresql/templates.yml
 - lib/generators/vulcanize/templates/redis/config/rubber/deploy-redis.rb