rubber 1.5.5 → 1.5.6

data/CHANGELOG

@@ -1,3 +1,8 @@
+1.5.5
+-----
+
+only existingg config files should be listed to fix non-existing env yml when doing a push_config <9fbb7ba> [Matt Conway]
+
 1.5.4
 -----
 

data/VERSION

@@ -1 +1 @@
-1.5.5
+1.5.6

data/generators/vulcanize/templates/base/config/deploy.rb

@@ -6,6 +6,7 @@ on :load do
   set :application, rubber_env.app_name
   set :runner,      rubber_env.app_user
   set :deploy_to,   "/mnt/#{application}-#{RUBBER_ENV}"
+  set :copy_exclude, [".git/*", "log/*"]
 end
 
 # Use a simple directory tree copy here to make demo easier.

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

@@ -3,14 +3,43 @@ namespace :rubber do
   
     rubber.allow_optional_tasks(self)
 
-    before "rubber:install_gems", "rubber:base:install_rvm"
+    before "rubber:setup_gem_sources", "rubber:base:install_rvm"
     task :install_rvm do
       rubber.sudo_script "install_rvm", <<-ENDSCRIPT
         if [[ `rvm --version 2> /dev/null` == "" ]]; then
           echo "rvm_prefix=/usr/local" > /etc/rvmrc
-          wget -qNP /tmp http://rvm.beginrescueend.com/releases/rvm-install-head
-          bash /tmp/rvm-install-head
           echo "#{rubber_env.rvm_prepare}" > /etc/profile.d/rvm.sh
+
+          # Copied below from http://rvm.beginrescueend.com/releases/rvm-install-latest
+          #
+
+          if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
+
+          if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+
+          rvm_path="${rvm_path:-$HOME/.rvm}"
+
+          mkdir -p $rvm_path/src/
+
+          builtin cd $rvm_path/src
+
+          stable_version=#{rubber_env.rvm_version}
+
+          echo "rvm-${stable_version}"
+
+          curl -L "http://rvm.beginrescueend.com/releases/rvm-${stable_version}.tar.gz" -o "rvm-${stable_version}.tar.gz"
+
+          tar zxf "rvm-${stable_version}.tar.gz"
+
+          builtin cd "rvm-${stable_version}"
+
+          dos2unix scripts/* >/dev/null 2>&1 || true
+
+          bash ./scripts/install
+
+          #
+          # end rvm install script
+
         fi
       ENDSCRIPT
     end

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

@@ -11,6 +11,9 @@
 
 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: 0.1.38
+
 # 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

data/generators/vulcanize/templates/cassandra/config/rubber/role/cassandra/cassandra.in.sh

@@ -56,3 +56,5 @@ JVM_OPTS=" \
         -Dcom.sun.management.jmxremote.port=<%= rubber_env.cassandra_jmx_port %> \
         -Dcom.sun.management.jmxremote.ssl=false \
         -Dcom.sun.management.jmxremote.authenticate=false"
+
+ulimit -n 65536

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

@@ -12,7 +12,7 @@ namespace :rubber do
       rubber.sudo_script 'setup_mongrel_init', <<-ENDSCRIPT
         mkdir -p /etc/mongrel_cluster
         rm -f /etc/mongrel_cluster/#{application}-#{RUBBER_ENV}.yml && ln -s /mnt/#{application}-#{RUBBER_ENV}/current/config/mongrel_cluster.yml /etc/mongrel_cluster/#{application}-#{RUBBER_ENV}.yml
-        find /usr/lib/ruby/gems -path "*/resources/mongrel_cluster" -exec cp {} /etc/init.d/ \\;
+        find #{rubber_env.rvm_version ? "$(rvm gemdir)" : "/usr/lib/ruby/gems"} -path "*/resources/mongrel_cluster" -exec cp {} /etc/init.d/ \\;
         chmod +x /etc/init.d/mongrel_cluster
         update-rc.d -f mongrel_cluster remove
         update-rc.d mongrel_cluster defaults 99 00

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

@@ -1,38 +1,72 @@
 <%
   @path = '/etc/munin/munin.conf'
-  @post = "mkdir -p /var/www/munin; chown -R munin:munin /var/www/munin"
 %>
 
 # Example configuration file for Munin, generated by 'make build'
 
 # The next three variables specifies where the location of the RRD
-# databases, the HTML output, and the logs, severally.  They all
-# must be writable by the user running munin-cron.
-dbdir /var/lib/munin
-htmldir /var/www/munin
-logdir  /var/log/munin
+# databases, the HTML output, logs and the lock/pid files.  They all
+# must be writable by the user running munin-cron.  They are all
+# defaulted to the values you see here.
+#
+dbdir	/var/lib/munin
+htmldir /var/cache/munin/www
+logdir /var/log/munin
 rundir  /var/run/munin
 
 # Where to look for the HTML templates
 tmpldir /etc/munin/templates
 
+# (Exactly one) directory to include all files from.
+#
+includedir /etc/munin/munin-conf.d
+
 # Make graphs show values per minute instead of per second
 #graph_period minute
 
+# Graphics files are normaly generated by munin-graph, no matter if
+# the graphs are used or not.  You can change this to
+# on-demand-graphing by following the instructions in
+# http://munin.projects.linpro.no/wiki/CgiHowto
+#
+#graph_strategy cgi
+
+# munin-cgi-graph is invoked by the web server up to very many times at the
+# same time.  This is not optimal since it results in high CPU and memory
+# consumption to the degree that the system can thrash.  Again the default is
+# 6.  Most likely the optimal number for max_cgi_graph_jobs is the same as
+# max_graph_jobs.
+#
+#munin_cgi_graph_jobs 6
+
+# If the automatic CGI url is wrong for your system override it here:
+#
+#cgiurl_graph /cgi-bin/munin-cgi-graph
+
+# munin-graph runs in parallel, the number of concurrent processes is
+# 6.  If you want munin-graph to not be parallel set to 0.  If set too
+# high it will slow down munin-graph.  Some experiments are needed to
+# determine how many are optimal on your system.  On a multi-core
+# system with good SCSI disks the number can probably be quite high.
+#
+#max_graph_jobs 6
+
 # Drop somejuser@fnord.comm and anotheruser@blibb.comm an email everytime
 # something changes (OK -> WARNING, CRITICAL -> OK, etc)
 #contact.someuser.command mail -s "Munin notification" somejuser@fnord.comm
 #contact.anotheruser.command mail -s "Munin notification" anotheruser@blibb.comm
 #
-# For those with Nagios, the following might come in handy. In addition,
-# the services must be defined in the Nagios server as well.
-#contact.nagios.command /usr/sbin/send_nsca -H nagios.host.com -c /etc/send_nsca.cfg
 
 contacts dev
 contact.dev.command mail -s "Munin notification ${var:host} : ${var:group}" <%= rubber_env.admin_email %>
 contact.dev.always_send warning critical
 
+# For those with Nagios, the following might come in handy. In addition,
+# the services must be defined in the Nagios server as well.
+#contact.nagios.command /usr/bin/send_nsca nagios.host.comm -c /etc/nsca.conf
 
+# The host tree generated by rubber
+#
 <% rubber_instances.each do |i| %>
 [<%= i.full_name %>]
   address <%= i.internal_ip %>

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

@@ -5,5 +5,5 @@
 %>
 
 # Roll the nginx logs at midnight
-0 0 * * * LOG_DIR=/mnt/nginx/log <%= RUBBER_ROOT %>/script/cron-rake rubber:rotate_logs
+0 0 * * * LOG_DIR=/mnt/nginx/logs <%= RUBBER_ROOT %>/script/cron-rake rubber:rotate_logs
 

data/lib/generators/vulcanize/templates/base/config/deploy.rb

@@ -6,6 +6,7 @@ on :load do
   set :application, rubber_env.app_name
   set :runner,      rubber_env.app_user
   set :deploy_to,   "/mnt/#{application}-#{RUBBER_ENV}"
+  set :copy_exclude, [".git/*", "log/*"]
 end
 
 # Use a simple directory tree copy here to make demo easier.

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

@@ -3,14 +3,43 @@ namespace :rubber do
   
     rubber.allow_optional_tasks(self)
 
-    before "rubber:install_gems", "rubber:base:install_rvm"
+    before "rubber:setup_gem_sources", "rubber:base:install_rvm"
     task :install_rvm do
       rubber.sudo_script "install_rvm", <<-ENDSCRIPT
         if [[ `rvm --version 2> /dev/null` == "" ]]; then
           echo "rvm_prefix=/usr/local" > /etc/rvmrc
-          wget -qNP /tmp http://rvm.beginrescueend.com/releases/rvm-install-head
-          bash /tmp/rvm-install-head
           echo "#{rubber_env.rvm_prepare}" > /etc/profile.d/rvm.sh
+
+          # Copied below from http://rvm.beginrescueend.com/releases/rvm-install-latest
+          #
+
+          if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
+
+          if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
+
+          rvm_path="${rvm_path:-$HOME/.rvm}"
+
+          mkdir -p $rvm_path/src/
+
+          builtin cd $rvm_path/src
+
+          stable_version=#{rubber_env.rvm_version}
+
+          echo "rvm-${stable_version}"
+
+          curl -L "http://rvm.beginrescueend.com/releases/rvm-${stable_version}.tar.gz" -o "rvm-${stable_version}.tar.gz"
+
+          tar zxf "rvm-${stable_version}.tar.gz"
+
+          builtin cd "rvm-${stable_version}"
+
+          dos2unix scripts/* >/dev/null 2>&1 || true
+
+          bash ./scripts/install
+
+          #
+          # end rvm install script
+
         fi
       ENDSCRIPT
     end

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

@@ -11,6 +11,9 @@
 
 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: 0.1.38
+
 # 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

data/lib/generators/vulcanize/templates/cassandra/config/rubber/role/cassandra/cassandra.in.sh

@@ -56,3 +56,5 @@ JVM_OPTS=" \
         -Dcom.sun.management.jmxremote.port=<%= rubber_env.cassandra_jmx_port %> \
         -Dcom.sun.management.jmxremote.ssl=false \
         -Dcom.sun.management.jmxremote.authenticate=false"
+
+ulimit -n 65536

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

@@ -12,7 +12,7 @@ namespace :rubber do
       rubber.sudo_script 'setup_mongrel_init', <<-ENDSCRIPT
         mkdir -p /etc/mongrel_cluster
         rm -f /etc/mongrel_cluster/#{application}-#{RUBBER_ENV}.yml && ln -s /mnt/#{application}-#{RUBBER_ENV}/current/config/mongrel_cluster.yml /etc/mongrel_cluster/#{application}-#{RUBBER_ENV}.yml
-        find /usr/lib/ruby/gems -path "*/resources/mongrel_cluster" -exec cp {} /etc/init.d/ \\;
+        find #{rubber_env.rvm_version ? "$(rvm gemdir)" : "/usr/lib/ruby/gems"} -path "*/resources/mongrel_cluster" -exec cp {} /etc/init.d/ \\;
         chmod +x /etc/init.d/mongrel_cluster
         update-rc.d -f mongrel_cluster remove
         update-rc.d mongrel_cluster defaults 99 00

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

@@ -1,38 +1,72 @@
 <%
   @path = '/etc/munin/munin.conf'
-  @post = "mkdir -p /var/www/munin; chown -R munin:munin /var/www/munin"
 %>
 
 # Example configuration file for Munin, generated by 'make build'
 
 # The next three variables specifies where the location of the RRD
-# databases, the HTML output, and the logs, severally.  They all
-# must be writable by the user running munin-cron.
-dbdir /var/lib/munin
-htmldir /var/www/munin
-logdir  /var/log/munin
+# databases, the HTML output, logs and the lock/pid files.  They all
+# must be writable by the user running munin-cron.  They are all
+# defaulted to the values you see here.
+#
+dbdir	/var/lib/munin
+htmldir /var/cache/munin/www
+logdir /var/log/munin
 rundir  /var/run/munin
 
 # Where to look for the HTML templates
 tmpldir /etc/munin/templates
 
+# (Exactly one) directory to include all files from.
+#
+includedir /etc/munin/munin-conf.d
+
 # Make graphs show values per minute instead of per second
 #graph_period minute
 
+# Graphics files are normaly generated by munin-graph, no matter if
+# the graphs are used or not.  You can change this to
+# on-demand-graphing by following the instructions in
+# http://munin.projects.linpro.no/wiki/CgiHowto
+#
+#graph_strategy cgi
+
+# munin-cgi-graph is invoked by the web server up to very many times at the
+# same time.  This is not optimal since it results in high CPU and memory
+# consumption to the degree that the system can thrash.  Again the default is
+# 6.  Most likely the optimal number for max_cgi_graph_jobs is the same as
+# max_graph_jobs.
+#
+#munin_cgi_graph_jobs 6
+
+# If the automatic CGI url is wrong for your system override it here:
+#
+#cgiurl_graph /cgi-bin/munin-cgi-graph
+
+# munin-graph runs in parallel, the number of concurrent processes is
+# 6.  If you want munin-graph to not be parallel set to 0.  If set too
+# high it will slow down munin-graph.  Some experiments are needed to
+# determine how many are optimal on your system.  On a multi-core
+# system with good SCSI disks the number can probably be quite high.
+#
+#max_graph_jobs 6
+
 # Drop somejuser@fnord.comm and anotheruser@blibb.comm an email everytime
 # something changes (OK -> WARNING, CRITICAL -> OK, etc)
 #contact.someuser.command mail -s "Munin notification" somejuser@fnord.comm
 #contact.anotheruser.command mail -s "Munin notification" anotheruser@blibb.comm
 #
-# For those with Nagios, the following might come in handy. In addition,
-# the services must be defined in the Nagios server as well.
-#contact.nagios.command /usr/sbin/send_nsca -H nagios.host.com -c /etc/send_nsca.cfg
 
 contacts dev
 contact.dev.command mail -s "Munin notification ${var:host} : ${var:group}" <%= rubber_env.admin_email %>
 contact.dev.always_send warning critical
 
+# For those with Nagios, the following might come in handy. In addition,
+# the services must be defined in the Nagios server as well.
+#contact.nagios.command /usr/bin/send_nsca nagios.host.comm -c /etc/nsca.conf
 
+# The host tree generated by rubber
+#
 <% rubber_instances.each do |i| %>
 [<%= i.full_name %>]
   address <%= i.internal_ip %>

data/lib/generators/vulcanize/templates/nginx/config/rubber/role/nginx/crontab

@@ -5,5 +5,5 @@
 %>
 
 # Roll the nginx logs at midnight
-0 0 * * * LOG_DIR=/mnt/nginx/log <%= RUBBER_ROOT %>/script/cron-rake rubber:rotate_logs
+0 0 * * * LOG_DIR=/mnt/nginx/logs <%= RUBBER_ROOT %>/script/cron-rake rubber:rotate_logs
 

data/lib/rubber/dns/dyndns.rb

@@ -29,12 +29,12 @@ module Rubber
         begin
           Resolv::DNS.open(:nameserver => [nameserver], :search => [], :ndots => 1) do |dns|
             r = dns.getresource(hostname, Resolv::DNS::Resource::IN::A)
-            result = [{:host =>host, :data => r.address}]
+            result = [{:host =>opts[:host], :data => r.address}]
           end
         rescue
+          puts "Rescue #{e} #{e.message}"
           raise "Domain needs to exist in dyndns as an A record before record can be updated"
         end
-        return true
       end
 
       def create_host_record(opts={})
@@ -46,13 +46,12 @@ module Rubber
       end
 
       def update_host_record(old_opts={}, new_opts={})
-        old_opts = setup_opts(opts, [:host, :domain])
-        new_opts = setup_opts(opts, [:data])
-        
-        host = hostname(old_opts[:host])
+        old_opts = setup_opts(old_opts, [:host, :domain])
+
+        host = "#{old_opts[:host]}.#{old_opts[:domain]}"
         ip = new_opts[:data]
         update_url = eval('%Q{' + @update_url + '}')
-
+        # puts update_url
         # This header is required by dyndns.org
         headers = {
          "User-Agent" => "Capistrano - Rubber - 0.1"

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

@@ -229,7 +229,7 @@ namespace :rubber do
         rubber_instances.save()
 
         # turn back on root ssh access if we are using root as the capistrano user for connecting
-        enable_root_ssh(instance_item.external_ip, fetch(:initial_ssh_user, 'ubuntu')) if user == 'root'
+        enable_root_ssh(instance_item.external_ip, fetch(:initial_ssh_user, 'ubuntu')) if (user == 'root' && ! instance_item.windows?)
 
         # setup amazon elastic ips if configured to do so
         setup_static_ips

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

@@ -397,9 +397,9 @@ namespace :rubber do
 
     rsudo "apt-get -q update"
     if upgrade
-      rsudo "export DEBIAN_FRONTEND=noninteractive; apt-get -q -y --force-yes dist-upgrade"
+      rsudo "export DEBIAN_FRONTEND=noninteractive; apt-get -q -o Dpkg::Options::=--force-confold -y --force-yes dist-upgrade"
     else
-      rsudo "export DEBIAN_FRONTEND=noninteractive; apt-get -q -y --force-yes install $CAPISTRANO:VAR$", opts
+      rsudo "export DEBIAN_FRONTEND=noninteractive; apt-get -q -o Dpkg::Options::=--force-confold -y --force-yes install $CAPISTRANO:VAR$", opts
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 5
-  version: 1.5.5
+  - 6
+  version: 1.5.6
 platform: ruby
 authors: 
 - Matt Conway
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 -04:00
+date: 2010-07-01 00:00:00 -04:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency