rubber 1.14.1 → 1.15.0

data/CHANGELOG

@@ -1,3 +1,38 @@
+1.15.0 (09/13/2011)
+
+New Features:
+============
+
+Added PostgreSQL streaming replication configuration (thanks Kevin Menard)
+Added the ability to specify mount options for volumes (thanks Alex Kremer)
+Added a minimal Passenger nginx configuration (thanks Will Koehler)
+Added SSL support for nginx-passenger (thanks Michael Glass)
+Added staging environment support fon nginx-passenger (thanks Michael Glass)
+
+Improvements:
+============
+
+Resque-web now runs as an unpriviliged user (thanks Scott Carleton)
+Better error message when having issues loading the Zerigo gem (thanks Rupert Meese)
+Upgraded Passenger to 3.0.9 (thanks Kevin Menard)
+Upgraded Redis to 2.2.13 (thanks Kevin Menard)
+Better .gemrc file setup (thanks Kevin Menard)
+
+Bug Fixes:
+==========
+
+Fixed an issue with setting up redis on Ubuntu 11.04 (thanks Kevin Menard)
+Fixed an issue with mysql-proxy not being added to the correct run level (thanks Alex Kremer)
+Fixed a typo in the passenger_nginx module name (thanks Alex Kremer)
+Fixed an issue with the munin generated Web site location (thanks Will Koehler)
+Fixed the open4 require issue (thanks Will Koehler)w
+Fixed a bunch of nginx-related issues (thanks Will Koehler)
+Fixed an environmental issue running ntpdate (thanks Will Koehler)
+Fixed compatibility issues with the Psych parser used in Ruby 1.9.2 (thanks Kevin Menard)
+Fixed timing issue with multiple resque workers starting (thanks Matt Conway)
+Fixed an issue with hostnames that happen to be monit commands (thanks Michael Glass)
+
+
 1.14.1 (06/02/2011)
 -----
 
@@ -12,6 +47,7 @@ Added ability to lockdown the version of rake that RVM will install (vulcanize b
 Added the image type and ID for each instance to the instance file
 Fixed an issue with LVM groups keeping physical volumes in /etc/fstab
 Fixed an issue using the mysql2 adapter with the stock MySQL config
+Disable ri and rdoc generation on new hosts
 
 1.13.2
 -----

data/VERSION

@@ -1 +1 @@
-1.14.1
+1.15.0

data/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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

data/generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-memory.conf

@@ -18,7 +18,7 @@ END
 end
 
 def output_values
-  status = `sudo <%= rubber_env.rvm_gem_home %>/bin/passenger-memory-stats | tail -1`
+  status = `rvm exec sudo <%= rubber_env.rvm_gem_home %>/bin/passenger-memory-stats | tail -1`
   unless $?.success?
     $stderr.puts "failed executing passenger-memory-stats"
     exit 1

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

@@ -21,7 +21,7 @@ END
 end
 
 def output_values
-  status = `sudo <%= rubber_env.rvm_gem_home %>/bin/passenger-status`
+  status = `rvm exec sudo <%= rubber_env.rvm_gem_home %>/bin/passenger-status`
   unless $?.success?
     $stderr.puts "failed executing passenger-status"
     exit 1

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

@@ -1,4 +1,4 @@
-passenger_version: 3.0.4
+passenger_version: 3.0.9
 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"