rubber 1.14.1 → 1.15.0

data/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/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/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/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/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/generators/vulcanize/templates/base/config/rubber/common/crontab

@@ -3,11 +3,10 @@
   @write_cmd = 'crontab -'
 %>
 
-# cron clears out enviroment variables, so we need to add these in
-# to make sure we are running the correct ruby (rvm env vars, plus paths)
-<%- ENV.select {|k, v| k =~ /rvm|ruby|bundler|gem|path/i }.each do |k, v| -%>
-<%= k %>='<%= v %>'
-<%- end -%>
+# cron clears out enviroment variables. We need to put our path back in so we can find RVM.
+# 'rvm exec' and 'bundle exec' in cron-rake will take care of setting up the rest of the
+# environment needed by Ruby / Rails
+PATH='<%= ENV['PATH'] %>'
 
 MAILTO=<%= rubber_env.admin_email %>
 # don't need to set RUBBER_ENV for each script since we set it for all cron here
@@ -19,4 +18,4 @@ RUBYOPT=rubygems
 0 0 * * * LOG_DIR=<%= RUBBER_ROOT %>/log <%= RUBBER_ROOT %>/script/cron-rake rubber:rotate_logs
 
 # Automatically set the clock for all machines
-<%= rand(60) %> 4 * * * <%= RUBBER_ROOT %>/script/cron-sh -- ntpdate pool.ntp.org
+<%= rand(60) %> 4 * * * rvm exec <%= RUBBER_ROOT %>/script/cron-sh -- ntpdate pool.ntp.org

data/lib/generators/vulcanize/templates/base/config/rubber/common/rsyslog.conf

@@ -0,0 +1,71 @@
+<%
+  log_dir = "/var/log/#{rubber_env.app_name}"
+  log_spool_dir = "/var/spool/rsyslog"
+
+  @path = "/etc/rsyslog.conf"
+  @post = <<-ENDSCRIPT
+    mkdir -p #{log_dir} #{log_spool_dir}
+    chown syslog:adm #{log_dir} #{log_spool_dir}
+    /usr/sbin/service rsyslog restart
+  ENDSCRIPT
+%>
+
+#  /etc/rsyslog.conf	Configuration file for rsyslog.
+#
+#			For more information see
+#			/usr/share/doc/rsyslog-doc/html/rsyslog_conf.html
+#
+#  Default logging rules can be found in /etc/rsyslog.d/50-default.conf
+
+
+#################
+#### MODULES ####
+#################
+
+$ModLoad imuxsock # provides support for local system logging
+$ModLoad imklog   # provides kernel logging support (previously done by rklogd)
+#$ModLoad immark  # provides --MARK-- message capability
+
+$KLogPath /proc/kmsg
+
+# provides UDP syslog reception
+$ModLoad imudp
+$UDPServerRun 514
+
+# provides TCP syslog reception
+#$ModLoad imtcp
+#$InputTCPServerRun 514
+
+$WorkDirectory <%= log_spool_dir %>
+$template LogCollectorDynFile,"<%= log_dir %>/%$YEAR%/%$MONTH%/%$DAY%/%programname%.log"
+
+###########################
+#### GLOBAL DIRECTIVES ####
+###########################
+
+#
+# Use traditional timestamp format.
+# To enable high precision timestamps, comment out the following line.
+#
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+
+# Don't filter duplicated messages
+$RepeatedMsgReduction off
+
+#
+# Set the default permissions for all log files.
+#
+$FileOwner syslog
+$FileGroup adm
+$FileCreateMode 0640
+$DirCreateMode 0755
+$Umask 0022
+$PrivDropToUser syslog
+$PrivDropToGroup adm
+# https://bugs.launchpad.net/ubuntu/+source/rsyslog/+bug/484336
+
+#
+# Include all config files in /etc/rsyslog.d/
+#
+$IncludeConfig /etc/rsyslog.d/*.conf
+

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

@@ -21,8 +21,13 @@ namespace :rubber do
           sed -i 's/rake.*/rake -v#{rubber_env.rake_version}/' #{rubber_env.rvm_prefix}/gemsets/global.gems
 
           # Set up the .gemrc file
-          echo "--- " >> ~/.gemrc
-          echo "gem: --no-ri --no-rdoc" >> ~/.gemrc
+          if [[ ! -f ~/.gemrc ]]; then
+            echo "--- " >> ~/.gemrc
+          fi
+
+          if ! grep -q 'gem: ' ~/.gemrc; then
+            echo "gem: --no-ri --no-rdoc" >> ~/.gemrc
+          fi
         fi
       ENDSCRIPT
     end

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

@@ -1,15 +1,3 @@
-# All variables can also be overridden on the role and/or host level by creating
-# a sub level to the config under roles and hosts
-# e.g. to install mysql only on db role, and awstats only on web01:
-#
-# packages: [ruby]
-# roles:
-#   db:
-#     packages: [mysql]
-# hosts:
-#   web01:
-#     packages: [awstats]
-
 # REQUIRED: The name of your application
 app_name: your_app_name
 
@@ -258,6 +246,10 @@ staging_roles: "web,app,db:primary=true"
 #
 # var_name: var_value
 
+# All variables can also be overridden on the role and/or host level by creating
+# a sub level to the config under roles and hosts
+# e.g. to install mysql only on db role, and awstats only on web01:
+
 # OPTIONAL: Role specific overrides
 # roles:
 #   somerole:

data/lib/generators/vulcanize/templates/base/script/cron-rake

@@ -14,5 +14,5 @@ rescue
 end
 
 Dir.chdir(RAILS_ROOT)
-args = %W{-l #{log} -- rake --trace} + ARGV
-system "script/cron-sh", *args
+args = %W{-l #{log} -- bundle exec rake -t} + ARGV
+system "rvm", "exec", "script/cron-sh", *args

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

@@ -0,0 +1,21 @@
+<%
+  @path = "/etc/haproxy/haproxy.cfg"
+  @additive = ["# start haproxy passenger", "# end haproxy passenger"]
+%>
+
+<%
+  backend_hosts = rubber_instances.for_role('app').collect { |i| i.name }
+%>
+
+listen passenger_proxy 0.0.0.0:<%= rubber_env.web_port %>
+  option forwardfor
+  <% backend_hosts.each do |server| %>
+    server <%= server %> <%= server %>:<%= rubber_env.passenger_listen_port %> maxconn <%= rubber_env.max_app_connections %> check
+  <% end %>
+
+listen passenger_proxy_ssl 0.0.0.0:<%= rubber_env.web_ssl_port %>
+  mode tcp
+  option forwardfor
+  <% backend_hosts.each do |server| %>
+    server <%= server %> <%= server %>:<%= rubber_env.passenger_listen_ssl_port %> maxconn <%= rubber_env.max_app_connections %> check
+  <% end %>

data/lib/generators/vulcanize/templates/complete_passenger_nginx/config/rubber/rubber-complete.yml

@@ -0,0 +1,38 @@
+role_dependencies:
+  web: [haproxy]
+  app: [passenger_nginx]
+
+web_port: 80
+web_ssl_port: 443
+web_tools_port: 8080
+web_tools_ssl_port: 8443
+
+security_groups:
+  web:
+    description: "To open up port #{web_port}/#{web_ssl_port} for http server on web role"
+    rules:
+      - protocol: tcp
+        from_port: "#{web_port}"
+        to_port: "#{web_port}"
+        source_ips: [0.0.0.0/0]
+      - protocol: tcp
+        from_port: "#{web_ssl_port}"
+        to_port: "#{web_ssl_port}"
+        source_ips: [0.0.0.0/0]
+  web_tools:
+    description: "To open up port #{web_tools_port}/#{web_tools_ssl_port} for internal/tools http server"
+    rules:
+      - protocol: tcp
+        from_port: "#{web_tools_port}"
+        to_port: "#{web_tools_port}"
+        source_ips: [0.0.0.0/0]
+      - protocol: tcp
+        from_port: "#{web_tools_ssl_port}"
+        to_port: "#{web_tools_ssl_port}"
+        source_ips: [0.0.0.0/0]
+
+roles:
+  web:
+    assigned_security_groups: [web]
+  web_tools:
+    assigned_security_groups: [web_tools]

data/lib/generators/vulcanize/templates/complete_passenger_nginx/templates.rb

@@ -0,0 +1,8 @@
+database_engines = ['mysql', 'postgresql']
+if ! database_engines.any? {|d| @template_dependencies.include?(d)}
+  db = Rubber::Util::prompt("DATABASE",
+                            "The database engine to use (#{database_engines.join(', ')})",
+                            true,
+                            'mysql')
+  template_dependencies << db
+end

data/lib/generators/vulcanize/templates/complete_passenger_nginx/templates.yml

@@ -0,0 +1,8 @@
+description: A fairly complete and scalable deployment setup using passenger and nginx
+dependent_templates:
+  - base
+  - haproxy
+  - passenger_nginx
+  - monit
+  - munin
+  - memcached

data/lib/generators/vulcanize/templates/complete_passenger_nginx_mysql/templates.yml

@@ -0,0 +1,4 @@
+description: A fairly complete and scalable mysql deployment setup using passenger/nginx
+dependent_templates:
+  - complete_passenger_nginx
+  - mysql

data/lib/generators/vulcanize/templates/complete_passenger_nginx_postgresql/templates.yml

@@ -0,0 +1,4 @@
+description: A fairly complete and scalable postgresql deployment setup using passenger/nginx
+dependent_templates:
+  - complete_passenger_nginx
+  - postgresql

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

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

data/lib/generators/vulcanize/templates/minimal_passenger_nginx/config/rubber/rubber-complete.yml

@@ -0,0 +1,37 @@
+role_dependencies:
+  app: [passenger_nginx]
+
+web_port: 80
+web_ssl_port: 443
+web_tools_port: 8080
+web_tools_ssl_port: 8443
+
+security_groups:
+  web:
+    description: "To open up port #{web_port}/#{web_ssl_port} for http server on web role"
+    rules:
+      - protocol: tcp
+        from_port: "#{web_port}"
+        to_port: "#{web_port}"
+        source_ips: [0.0.0.0/0]
+      - protocol: tcp
+        from_port: "#{web_ssl_port}"
+        to_port: "#{web_ssl_port}"
+        source_ips: [0.0.0.0/0]
+  web_tools:
+    description: "To open up port #{web_tools_port}/#{web_tools_ssl_port} for internal/tools http server"
+    rules:
+      - protocol: tcp
+        from_port: "#{web_tools_port}"
+        to_port: "#{web_tools_port}"
+        source_ips: [0.0.0.0/0]
+      - protocol: tcp
+        from_port: "#{web_tools_ssl_port}"
+        to_port: "#{web_tools_ssl_port}"
+        source_ips: [0.0.0.0/0]
+
+roles:
+  web:
+    assigned_security_groups: [web]
+  web_tools:
+    assigned_security_groups: [web_tools]

data/lib/generators/vulcanize/templates/minimal_passenger_nginx/templates.yml

@@ -0,0 +1,4 @@
+description: A minimal deployment setup using passenger and nginx
+dependent_templates:
+  - base
+  - passenger_nginx

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

@@ -19,8 +19,12 @@ namespace :rubber do
     end
     
     task :setup_paths, :roles => :mongodb do
-      rsudo "mkdir -p #{rubber_env.mongodb_data_dir}"
-      rsudo "chown -R mongodb:mongodb #{rubber_env.mongodb_data_dir}"
+      rubber.sudo_script 'setup_mongodb_paths', <<-ENDSCRIPT
+        if [[ ! -d "#{rubber_env.mongodb_data_dir}" ]]; then
+          mkdir -p #{rubber_env.mongodb_data_dir}
+          chown -R mongodb:mongodb #{rubber_env.mongodb_data_dir}
+        fi
+      ENDSCRIPT
     end
     
     desc <<-DESC

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

@@ -5,6 +5,7 @@
 <% rubber_instances.each do |ic| %>
   location /monit_<%= ic.name %>
   {
+    rewrite ^/monit_<%= ic.name %>/(.*) /$1 break;  
     proxy_pass http://<%= ic.full_name %>:<%= rubber_env.monit_admin_port %>;
   }
 <% end %>

data/lib/generators/vulcanize/templates/munin/config/rubber/role/web_tools/munin.conf

@@ -1,5 +1,6 @@
 <%
   @path = '/etc/munin/munin.conf'
+  @post = 'mkdir -p /var/www/munin; chown munin:munin /var/www/munin'
 %>
 
 # Example configuration file for Munin, generated by 'make build'
@@ -10,7 +11,7 @@
 # defaulted to the values you see here.
 #
 dbdir	/var/lib/munin
-htmldir /var/cache/munin/www
+htmldir /var/www/munin
 logdir /var/log/munin
 rundir  /var/run/munin
 

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

@@ -26,7 +26,7 @@ db_log_dir: "#{db_root_dir}/log"
 # Capistrano needs db:primary role for migrate to work,
 # so we might as well just make consistent across the board
 role_dependencies:
-  mysql_master: [db:primary=true]
+  mysql_master: ["db:primary=true"]
   mysql_slave: [db]
   db:primary=true: [mysql_master]
   db: [mysql_slave]

data/lib/generators/vulcanize/templates/mysql_proxy/config/rubber/common/mysql-proxy

@@ -1,6 +1,7 @@
 <%
   @path = "/etc/init.d/mysql-proxy"
   @perms = 0755
+  @post = "/usr/sbin/update-rc.d -f mysql-proxy defaults"
 %>#! /bin/sh
 ### BEGIN INIT INFO
 # Provides:          mysql-proxy

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

@@ -13,7 +13,7 @@ namespace :rubber do
         # when variable interpolation of rvm_gem_home is run remotely, and since we
         # are in cap, we run the interpolation locally
         #
-        passenger_lib=$(find /usr/local/rvm -path "*/passenger-#{rubber_env.passenger_version}/*/mod_passenger.so" 2> /dev/null)
+        passenger_lib=$(find /usr/local/rvm/gems/`rvm current` -path "*/passenger-#{rubber_env.passenger_version}/*/mod_passenger.so" 2> /dev/null)
         if [[ -z $passenger_lib ]]; then
           echo -en "\n\n\n\n" | passenger-install-apache2-module
           rvm #{rubber_env.rvm_ruby} --passenger