rubber 1.1.5 → 1.1.6

data/CHANGELOG

@@ -1,3 +1,28 @@
+1.1.6
+-----
+
+stop using helper method to install ree as it uses different path for 64bit pkg <fbdeab3> [Matt Conway]
+remind about bootstrap <fd2e593> [Matt Conway]
+fix setting of rails vars <cd7206d> [Matt Conway]
+Merge remote branch 'nirvdrum/master' into pull <b902618> [Matt Conway]
+add passenger memory stats munin plugin <de6bb9a> [Matt Conway]
+setup path so that we select correct ruby globally <8365a70> [Matt Conway]
+sort display order of tools <4a7a9a0> [Matt Conway]
+fix arithmetic for server slicing in serial_task <4bbd9e7> [Matt Conway]
+Upgraded to the latest version of redis. <a62955f> [Kevin Menard]
+Merge branch 'wr0ngway/master' <09046af> [Kevin Menard]
+escape percents in crontab <a299c3b> [Matt Conway]
+fix ruby prefix path for passenger munin plugin <af9488d> [Matt Conway]
+fix config reference in munin example <50e563d> [Matt Conway]
+enable rubygems at system level for munin plugins <df32e3e> [Matt Conway]
+env should use rubygems by default <c2467cc> [Matt Conway]
+make default bucket name be dns friendly <b58fbbe> [Matt Conway]
+fix sphinx crontab to sudo using configured user <3fe8b6f> [Matt Conway]
+fix being able to reference cluster config (instance.yml) from within rubber.yml <08fecec> [Matt Conway]
+Fixed monit conf file. <d84d287> [Kevin Menard]
+git-core is fine on modern Ubuntu AMIs. <16eda00> [Kevin Menard]
+Added a jetty generator. <5c18774> [Kevin Menard]
+
 1.1.5
 -----
 

data/VERSION

@@ -1 +1 @@
-1.1.5
+1.1.6

data/generators/vulcanize/templates/apache/config/rubber/role/web_tools/tools-index.html

@@ -17,11 +17,11 @@
         <li><a href="http://<%= cruise_host %>/cruise/">CruiseControl</a></li>
       <% end %>
 
-		  <% rubber_instances.for_role('haproxy').each do |ic| %>
+		  <% rubber_instances.for_role('haproxy').sort {|a,b| a.name <=> b.name }.each do |ic| %>
 		      <li><a href="/haproxy_<%= ic.name %>/">HAProxy <%= ic.name %></a></li>
 		  <% end %>
 
-      <% rubber_instances.each do |ic| %>
+      <% rubber_instances.sort {|a,b| a.name <=> b.name }.each do |ic| %>
           <li><a href="/monit_<%= ic.name %>/">Monit <%= ic.name %></a></li>
       <% end %>
 

data/generators/vulcanize/templates/base/config/rubber/common/crontab

@@ -3,7 +3,7 @@
   @write_cmd = 'crontab -'
 %>
 
-PATH=/usr/local/bin:/usr/local/sbin:/usr/local/mysql/bin:/usr/bin:/bin:/sbin:/usr/sbin
+PATH=/sbin:/usr/sbin:/usr/local/sbin:<%= rubber_env.ruby_prefix %>/bin:/usr/local/bin:/usr/bin:/bin
 MAILTO=<%= rubber_env.admin_email %>
 # don't need to set RUBBER_ENV for each script since we set it for all cron here
 RUBBER_ENV=<%= RUBBER_ENV %>

data/generators/vulcanize/templates/base/config/rubber/common/rubber.profile

@@ -0,0 +1,14 @@
+<%
+  @path = "/etc/profile.d/rubber.sh"
+%>
+
+# convenience to simply running rails console, etc with correct env
+export RUBBER_ENV=<%= RUBBER_ENV %>
+export RAILS_ENV=<%= RUBBER_ENV %>
+alias current="cd <%= RUBBER_ROOT %>"
+
+# make sure we use the right ruby since REE installs into /usr/local
+export PATH=<%= rubber_env.ruby_prefix %>/bin:$PATH
+
+# Always use rubygems
+export RUBYOPT="rubygems"

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

@@ -19,9 +19,20 @@ namespace :rubber do
 
       if ent_ruby_hosts.size > 0
         task :_install_enterprise_ruby, :hosts => ent_ruby_hosts do
-          custom_package('http://rubyforge.org/frs/download.php/66164',
-                         'ruby-enterprise', '1.8.7-2009.10',
-                         '! `ruby --version 2> /dev/null` =~ "Ruby Enterprise Edition 2009.10"')
+          ver = "1.8.7-2009.10"
+          rubber.run_script "install_ruby-enterprise", <<-ENDSCRIPT
+            if [[ ! `ruby --version 2> /dev/null` =~ "Ruby Enterprise Edition 2009.10" ]]; then
+              arch=`uname -m`
+              if [ "$arch" = "x86_64" ]; then
+                src="http://rubyforge.org/frs/download.php/66163/ruby-enterprise_#{ver}_amd64.deb"
+              else
+                src="http://rubyforge.org/frs/download.php/66164/ruby-enterprise_#{ver}_i386.deb"
+              fi
+              src_file="${src##*/}"
+              wget -qP /tmp ${src}
+              dpkg -i /tmp/${src_file}
+            fi
+          ENDSCRIPT
         end
 
         _install_enterprise_ruby
@@ -46,26 +57,13 @@ namespace :rubber do
       ENDSCRIPT
     end
     
-    # git in ubuntu 7.0.4 is very out of date and doesn't work well with capistrano
-    after "rubber:install_packages", "rubber:base:install_git" if scm == "git"
-    task :install_git do
-      rubber.run_script 'install_git', <<-ENDSCRIPT
-        if ! git --version &> /dev/null; then
-          arch=`uname -m`
-          if [ "$arch" = "x86_64" ]; then
-            src="http://mirrors.kernel.org/ubuntu/pool/main/g/git-core/git-core_1.5.4.5-1~dapper1_amd64.deb"
-          else
-            src="http://mirrors.kernel.org/ubuntu/pool/main/g/git-core/git-core_1.5.4.5-1~dapper1_i386.deb"
-          fi
-          apt-get install liberror-perl libdigest-sha1-perl
-          wget -qO /tmp/git.deb ${src}
-          dpkg -i /tmp/git.deb
-
-          if [[ "#{repository}" =~ "@" ]]; then
-            # Get host key for src machine to prevent ssh from failing
-            rm -f ~/.ssh/known_hosts
-            ! ssh -o 'StrictHostKeyChecking=no' #{repository.gsub(/:.*/, '')} &> /dev/null
-          fi
+    after "rubber:install_packages", "rubber:base:configure_git" if scm == "git"
+    task :configure_git do
+      rubber.run_script 'configure_git', <<-ENDSCRIPT
+        if [[ "#{repository}" =~ "@" ]]; then
+          # Get host key for src machine to prevent ssh from failing
+          rm -f ~/.ssh/known_hosts
+          ! ssh -o 'StrictHostKeyChecking=no' #{repository.gsub(/:.*/, '')} &> /dev/null
         fi
       ENDSCRIPT
     end

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

@@ -68,10 +68,10 @@ cloud_providers:
     #
     # pk_file: "#{Dir[(File.expand_path('~') rescue '/root') + '/.ec2/pk-*'].first}"
     # cert_file: "#{Dir[(File.expand_path('~') rescue '/root') + '/.ec2/cert-*'].first}"
-    # image_bucket: "#{app_name}_images"
+    # image_bucket: "#{app_name}-images"
 
     # OPTIONAL: Needed for backing up database to s3
-    # backup_bucket: "#{app_name}_backups"
+    # backup_bucket: "#{app_name}-backups"
 
     # REQUIRED: the ami and instance type for creating instances
     # The Ubuntu images at http://alestic.com/ work well
@@ -120,10 +120,14 @@ isolate_security_groups: true
 # OPTIONAL: Set if you want to use Ruby Enterprise Edition instead of the standard ubuntu one
 use_enterprise_ruby: false
 
+# REE installs into /usr/local, so this lets us setup environment to use it globally
+# instead of system ruby
+ruby_prefix: "#{use_enterprise_ruby ? '/usr/local' : '/usr'}"
+
 # OPTIONAL: The packages to install on all instances
 # You can install a specific version of a package by using a sub-array of pkg, version
 # For example, packages: [[rake, 0.7.1], irb]
-packages: [postfix, build-essential, ruby-full, ruby1.8-dev, rake, irb]
+packages: [postfix, build-essential, ruby-full, ruby1.8-dev, rake, irb, git-core]
 
 # OPTIONAL: gem sources to setup for rubygems
 gemsources: ["http://gemcutter.org", "http://gems.rubyforge.org/", "http://gems.github.com"]

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

@@ -0,0 +1,56 @@
+
+namespace :rubber do
+
+  namespace :jetty do
+  
+    rubber.allow_optional_tasks(self)
+  
+    after "rubber:install_packages", "rubber:jetty:custom_install"
+    
+    task :custom_install, :roles => :jetty do
+      rubber.sudo_script 'install_jetty', <<-ENDSCRIPT
+        if [[ -z `ls #{rubber_env.jetty_dir} 2> /dev/null` ]]; then
+          wget -q http://ftp.osuosl.org/pub/eclipse/jetty/#{rubber_env.jetty_version}/dist/jetty-distribution-#{rubber_env.jetty_version}.tar.gz
+          tar -zxf jetty-distribution-#{rubber_env.jetty_version}.tar.gz
+          
+          # Install to appropriate location.
+          mv jetty-distribution-#{rubber_env.jetty_version} #{rubber_env.jetty_prefix}
+          ln -s #{rubber_env.jetty_prefix}/jetty-distribution-#{rubber_env.jetty_version} #{rubber_env.jetty_dir}
+          chmod 744 #{rubber_env.jetty_dir}/bin/*.sh
+          
+          # Cleanup the jetty distribution
+          rm #{rubber_env.jetty_dir}/webapps/*
+          rm -r #{rubber_env.jetty_dir}/contexts/test.d/
+          mv #{rubber_env.jetty_dir}/contexts/demo.xml #{rubber_env.jetty_dir}/contexts/demo.xml.example
+          mv #{rubber_env.jetty_dir}/contexts/javadoc.xml #{rubber_env.jetty_dir}/contexts/javadoc.xml.example
+          
+          # Cleanup after ourselves.
+          rm jetty-distribution-#{rubber_env.jetty_version}.tar.gz
+        fi
+      ENDSCRIPT
+    end
+
+    after "rubber:setup_app_permissions", "rubber:jetty:setup_jetty_permissions"
+
+    task :setup_jetty_permissions, :roles => :jetty do
+      run "chown -R #{rubber_env.app_user}:#{rubber_env.app_user} #{rubber_env.jetty_dir}"
+    end
+    
+    before "deploy:stop", "rubber:jetty:stop"
+    after "deploy:start", "rubber:jetty:start"
+    after "deploy:restart", "rubber:jetty:restart"
+    
+    task :restart, :roles => :jetty do
+      run "#{rubber_env.jetty_dir}/bin/jetty.sh restart"
+    end
+    
+    task :stop, :roles => :jetty do
+      run "#{rubber_env.jetty_dir}/bin/jetty.sh stop"
+    end
+    
+    task :start, :roles => :jetty do
+      run "#{rubber_env.jetty_dir}/bin/jetty.sh start"
+    end
+    
+  end
+end

data/generators/vulcanize/templates/jetty/config/rubber/role/jetty/jetty.xml

@@ -0,0 +1,199 @@
+<%-
+  @path = "#{rubber_env.jetty_dir}/etc/jetty.xml"
+%><?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
+
+<!-- =============================================================== -->
+<!-- Configure the Jetty Server                                      -->
+<!--                                                                 -->
+<!-- Documentation of this file format can be found at:              -->
+<!-- http://docs.codehaus.org/display/JETTY/jetty.xml                -->
+<!--                                                                 -->
+<!-- =============================================================== -->
+
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+
+    <!-- =========================================================== -->
+    <!-- Server Thread Pool                                          -->
+    <!-- =========================================================== -->
+    <Set name="ThreadPool">
+      <!-- Default queued blocking threadpool 
+      -->
+      <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
+        <Set name="minThreads">10</Set>
+        <Set name="maxThreads">200</Set>
+      </New>
+
+      <!-- Optional Java 5 bounded threadpool with job queue 
+      <New class="org.eclipse.thread.concurrent.ThreadPool">
+        <Set name="corePoolSize">50</Set>
+        <Set name="maximumPoolSize">50</Set>
+      </New>
+      -->
+    </Set>
+
+
+
+    <!-- =========================================================== -->
+    <!-- Set connectors                                              -->
+    <!-- =========================================================== -->
+
+    <Call name="addConnector">
+      <Arg>
+          <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
+            <Set name="host"><SystemProperty name="jetty.host" /></Set>
+            <Set name="port"><SystemProperty name="jetty.port" default="<%= rubber_env.jetty_port %>"/></Set>
+            <Set name="maxIdleTime">300000</Set>
+            <Set name="Acceptors">2</Set>
+            <Set name="statsOn">false</Set>
+            <Set name="confidentialPort">8443</Set>
+	    <Set name="lowResourcesConnections">20000</Set>
+	    <Set name="lowResourcesMaxIdleTime">5000</Set>
+          </New>
+      </Arg>
+    </Call>
+
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- To add a HTTPS SSL connector                                    -->
+    <!-- mixin jetty-ssl.xml:                                            -->
+    <!--   java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml           -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- To add a HTTP blocking connector                                -->
+    <!-- mixin jetty-bio.xml:                                            -->
+    <!--   java -jar start.jar etc/jetty.xml etc/jetty-bio.xml           -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- To allow Jetty to be started from xinetd                        -->
+    <!-- mixin jetty-xinetd.xml:                                         -->
+    <!--   java -jar start.jar etc/jetty.xml etc/jetty-xinetd.xml        -->
+    <!--                                                                 -->
+    <!-- See jetty-xinetd.xml for further instructions.                  -->
+    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+    <!-- =========================================================== -->
+    <!-- Set handler Collection Structure                            --> 
+    <!-- =========================================================== -->
+    <Set name="handler">
+      <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
+        <Set name="handlers">
+         <Array type="org.eclipse.jetty.server.Handler">
+           <Item>
+             <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
+           </Item>
+           <Item>
+             <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
+           </Item>
+           <Item>
+             <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler"/>
+           </Item>
+         </Array>
+        </Set>
+      </New>
+    </Set>
+    
+    <!-- =========================================================== -->
+    <!-- Configure the context deployer                              -->
+    <!-- A context deployer will deploy contexts described in        -->
+    <!-- configuration files discovered in a directory.              -->
+    <!-- The configuration directory can be scanned for hot          -->
+    <!-- deployments at the configured scanInterval.                 -->
+    <!--                                                             -->
+    <!-- This deployer is configured to deploy contexts configured   -->
+    <!-- in the $JETTY_HOME/contexts directory                       -->
+    <!--                                                             -->
+    <!-- =========================================================== -->
+    <Call name="addBean">
+      <Arg>
+        <New class="org.eclipse.jetty.deploy.ContextDeployer">
+          <Set name="contexts"><Ref id="Contexts"/></Set>
+          <Set name="configurationDir"><SystemProperty name="jetty.home" default="."/>/contexts</Set>
+          <Set name="scanInterval">5</Set>
+          <Call name="setAttribute">
+            <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
+            <Arg>.*/jsp-api-[^/]*\.jar$|.*/jsp-[^/]*\.jar$</Arg>
+          </Call>
+        </New>
+      </Arg>
+    </Call>
+
+    <!-- =========================================================== -->
+    <!-- Configure the webapp deployer.                              -->
+    <!-- A webapp  deployer will deploy standard webapps discovered  -->
+    <!-- in a directory at startup, without the need for additional  -->
+    <!-- configuration files.    It does not support hot deploy or   -->
+    <!-- non standard contexts (see ContextDeployer above).          -->
+    <!--                                                             -->
+    <!-- This deployer is configured to deploy webapps from the      -->
+    <!-- $JETTY_HOME/webapps directory                               -->
+    <!--                                                             -->
+    <!-- Normally only one type of deployer need be used.            -->
+    <!--                                                             -->
+    <!-- =========================================================== -->
+    <Call name="addBean">
+      <Arg>
+        <New class="org.eclipse.jetty.deploy.WebAppDeployer">
+          <Set name="contexts"><Ref id="Contexts"/></Set>
+          <Set name="webAppDir"><SystemProperty name="jetty.home" default="."/>/webapps</Set>
+	  <Set name="parentLoaderPriority">false</Set>
+	  <Set name="extract">true</Set>
+	  <Set name="allowDuplicates">false</Set>
+          <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
+          <Call name="setAttribute">
+            <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
+            <Arg>.*/jsp-api-[^/]*\.jar$|.*/jsp-[^/]*\.jar$</Arg>
+          </Call>
+        </New>
+      </Arg>
+    </Call>
+
+    <!-- =========================================================== -->
+    <!-- Configure Authentication Login Service                      -->
+    <!-- Realms may be configured for the entire server here, or     -->
+    <!-- they can be configured for a specific web app in a context  -->
+    <!-- configuration (see $(jetty.home)/contexts/test.xml for an   -->
+    <!-- example).                                                   -->
+    <!-- =========================================================== -->
+    <Call name="addBean">
+      <Arg>
+        <New class="org.eclipse.jetty.security.HashLoginService">
+          <Set name="name">Test Realm</Set>
+          <Set name="config"><SystemProperty name="jetty.home" default="."/>/etc/realm.properties</Set>
+          <Set name="refreshInterval">0</Set>
+        </New>
+      </Arg>
+    </Call>
+
+    <!-- =========================================================== -->
+    <!-- Configure Request Log                                       -->
+    <!-- Request logs  may be configured for the entire server here, -->
+    <!-- or they can be configured for a specific web app in a       -->
+    <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
+    <!-- for an example).                                            -->
+    <!-- =========================================================== -->
+    <Ref id="RequestLog">
+      <Set name="requestLog">
+        <New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
+          <Set name="filename"><SystemProperty name="jetty.home" default="."/>/logs/yyyy_mm_dd.request.log</Set>
+          <Set name="filenameDateFormat">yyyy_MM_dd</Set>
+          <Set name="retainDays">90</Set>
+          <Set name="append">true</Set>
+          <Set name="extended">false</Set>
+          <Set name="logCookies">false</Set>
+          <Set name="LogTimeZone">GMT</Set>
+        </New>
+      </Set>
+    </Ref>
+
+    <!-- =========================================================== -->
+    <!-- extra options                                               -->
+    <!-- =========================================================== -->
+    <Set name="stopAtShutdown">true</Set>
+    <Set name="sendServerVersion">true</Set>
+    <Set name="sendDateHeader">true</Set>
+    <Set name="gracefulShutdown">1000</Set>
+
+</Configure>

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

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

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

@@ -0,0 +1,8 @@
+jetty_version: 7.0.0.v20091005
+jetty_prefix: /opt
+jetty_dir: "#{jetty_prefix}/jetty"
+jetty_port: 8080
+
+roles:
+  jetty:
+    packages: [openjdk-6-jdk]

data/generators/vulcanize/templates/jetty/templates.yml

@@ -0,0 +1 @@
+description: Jetty HTTP server and servlet container module

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

@@ -8,12 +8,12 @@
   <% PIDFILE = "#{RUBBER_ROOT}/tmp/pids/mongrel.#{PORT}.pid" %>
   check process mongrel-<%= PORT %> with pidfile <%= PIDFILE %>
     group mongrel-<%= RUBBER_ENV %>
-    start program = "/bin/sh -c 'cd <%= RUBBER_ROOT %> && PATH=/usr/local/bin:$PATH && mongrel_rails cluster::start --clean --only <%= PORT %>'"
+    start program = "/bin/sh -c 'cd <%= RUBBER_ROOT %> && PATH=<%= rubber_env.ruby_prefix %>/bin:/usr/local/bin:$PATH && mongrel_rails cluster::start --clean --only <%= PORT %>'"
     <%
     # Stop gracefully - monit waits for stop to complete (since below process exits immediately, it must
     # wait for pid to disappear) before trying to start
     %>
-    stop program = "/bin/sh -c 'cd <%= RUBBER_ROOT %> && PATH=/usr/local/bin:$PATH && mongrel_rails cluster::stop --clean --only <%= PORT %> && sleep 30 && mongrel_rails cluster::stop --clean --force --only <%= PORT %>'"
+    stop program = "/bin/sh -c 'cd <%= RUBBER_ROOT %> && PATH=<%= rubber_env.ruby_prefix %>/bin:/usr/local/bin:$PATH && mongrel_rails cluster::stop --clean --only <%= PORT %> && sleep 30 && mongrel_rails cluster::stop --clean --force --only <%= PORT %>'"
     if totalmem > 200.0 MB for 3 cycles then restart
     <%# monit needs to test on same same interface that mongrel is listening on (see mongrel_cluster.yml) %>
     if failed host <%= rubber_env.host %> port <%= PORT %> protocol http with timeout 10 seconds for 10 cycles then restart

data/generators/vulcanize/templates/munin/config/rubber/common/munin-plugins.conf

@@ -0,0 +1,9 @@
+<%
+  @path = '/etc/munin/plugin-conf.d/rubber'
+%>
+
+# munin-node clears out enviroment variables, so we need to add these in
+# to make sure we are running the correct ruby (REE vs regular)
+[*]
+env.PATH /sbin:/usr/sbin:/usr/local/sbin:<%= rubber_env.ruby_prefix %>/bin:/usr/local/bin:/usr/bin:/bin
+env.RUBYOPT rubygems

data/generators/vulcanize/templates/munin/script/munin/example_mysql_query.rb

@@ -43,10 +43,10 @@ source ||= RUBBER_INSTANCES.for_role("mysql_slave").first
 source ||= RUBBER_INSTANCES.for_role("mysql_master").first
 db_host = source ? source.full_name : 'localhost'
 
-command = "mysql -u #{RUBBER_ENV.db_slave_user}"
-command << " --password=#{RUBBER_ENV.db_pass}"
+command = "mysql -u #{RUBBER_CONFIG.db_slave_user}"
+command << " --password=#{RUBBER_CONFIG.db_pass}"
 command << " -h #{db_host}"
-command << " #{RUBBER_ENV.db_name} --skip-column-names"
+command << " #{RUBBER_CONFIG.db_name} --skip-column-names"
 
 # execute a sql query to get some data
 data = `echo "#{query}" | #{command}`

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

@@ -0,0 +1,34 @@
+<%
+  @path = "/etc/munin/plugins/passenger_memory_status"
+  @perms = 0755
+%>#!/usr/bin/env ruby
+# put in /etc/munin/plugins and restart munin-node
+# by Dan Manges, http://www.dcmanges.com/blog/rails-application-visualization-with-munin
+# NOTE: you might need to add munin to allow passwordless sudo for passenger-memory-stats
+
+def output_config
+  puts <<-END
+graph_category App
+graph_title Passenger memory stats
+graph_vlabel megabytes
+
+memory.label memory
+END
+  exit 0
+end
+
+def output_values
+  status = `sudo <%= rubber_env.ruby_prefix %>/bin/passenger-memory-stats | tail -1`
+  unless $?.success?
+    $stderr.puts "failed executing passenger-memory-stats"
+    exit 1
+  end
+  status =~ /(\d+\.\d+)/
+  puts "memory.value #{$1}"
+end
+
+if ARGV[0] == "config"
+  output_config
+else
+  output_values
+end

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

@@ -3,4 +3,5 @@
   @additive = ["# munin passenger start", "# munin passenger end"]
 %>
 
-nobody  ALL=(ALL) NOPASSWD: /usr/bin/passenger-status
+nobody  ALL=(ALL) NOPASSWD: <%= rubber_env.ruby_prefix %>/bin/passenger-status
+nobody  ALL=(ALL) NOPASSWD: <%= rubber_env.ruby_prefix %>/bin/passenger-memory-stats

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

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

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

@@ -1,5 +1,4 @@
 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"

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

@@ -8,7 +8,7 @@ namespace :rubber do
     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')
+      custom_package('http://ftp.us.debian.org/debian/pool/main/r/redis/', 'redis-server', '1.02-1', '! -x /usr/bin/redis-server')
     end
 
     desc "Stops the redis server"

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

@@ -5,4 +5,4 @@
 %>
 
 # 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
+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/sphinx/config/rubber/role/sphinx/crontab

@@ -5,7 +5,7 @@
 %>
 
 # incremental index once every 10 minutes
-*/10 * * * * sudo -u rails <%= RUBBER_ROOT %>/script/cron-rake RUBBER_ENV=<%= RUBBER_ENV %> ts:in:delta
+*/10 * * * * sudo -u <%= rubber_env.app_user %> <%= RUBBER_ROOT %>/script/cron-rake RUBBER_ENV=<%= RUBBER_ENV %> ts:in:delta
 
 # full reindex daily at 4:35
-35 4 * * * sudo -u rails <%= RUBBER_ROOT %>/script/cron-rake RUBBER_ENV=<%= RUBBER_ENV %> ts:index
+35 4 * * * sudo -u <%= rubber_env.app_user %> <%= RUBBER_ROOT %>/script/cron-rake RUBBER_ENV=<%= RUBBER_ENV %> ts:index

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

@@ -4,7 +4,7 @@
 
 check process sphinx with pidfile <%= RUBBER_ROOT %>/log/searchd.<%= RUBBER_ENV %>.pid
   group sphinx-<%= RUBBER_ENV %>
-  start program = "/usr/bin/sudo -u rails sh -c 'cd <%= RUBBER_ROOT %> && PATH=/usr/local/bin:$PATH RAILS_ENV=<%= RUBBER_ENV %> rake ts:start'"
-  stop program  = "/usr/bin/sudo -u rails sh -c 'cd <%= RUBBER_ROOT %> && PATH=/usr/local/bin:$PATH RAILS_ENV=<%= RUBBER_ENV %> rake ts:stop'"
+  start program = "/usr/bin/sudo -u rails sh -c 'cd <%= RUBBER_ROOT %> && PATH=<%= rubber_env.ruby_prefix %>/bin:/usr/local/bin:$PATH RAILS_ENV=<%= RUBBER_ENV %> rake ts:start'"
+  stop program  = "/usr/bin/sudo -u rails sh -c 'cd <%= RUBBER_ROOT %> && PATH=<%= rubber_env.ruby_prefix %>/bin:/usr/local/bin:$PATH RAILS_ENV=<%= RUBBER_ENV %> rake ts:stop'"
   if failed host <%= rubber_env.host %> port 3312 with timeout 5 seconds for 5 cycles then restart
 

data/lib/rubber.rb

@@ -14,7 +14,7 @@ module Rubber
     # We actually do NOT want the entire rails environment because it
     # complicates bootstrap (i.e. can't run config to create db because full
     # rails env needs db to exist as some plugin accesses model or something)
-    rails_boot_file = File.join(RUBBER_ROOT, 'config', 'boot')
+    rails_boot_file = File.join(RUBBER_ROOT, 'config', 'boot.rb')
     require(rails_boot_file) if File.exists? rails_boot_file
 
     if defined?(RAILS_DEFAULT_LOGGER) && RAILS_DEFAULT_LOGGER

data/lib/rubber/environment.rb

@@ -79,6 +79,10 @@ module Rubber
           replace(receiver)
         end
 
+        def rubber_instances
+          @rubber_instances ||= Rubber::Configuration::rubber_instances
+        end
+
         def [](name)
           value = super(name)
           value = global[name] if global && !value
@@ -136,10 +140,6 @@ module Rubber
           @full_host ||= "#{host}.#{domain}" rescue nil
         end
 
-        def rubber_instances
-          @rubber_instances ||= Rubber::Configuration::rubber_instances
-        end
-
         # Forces role/host overrides into config
         def bind_config(global)
           global = global.clone()

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

@@ -89,6 +89,8 @@ namespace :rubber do
     rubber_instances.save()
     logger.info "Roles for #{instance_alias} are now:"
     logger.info instance.role_names.sort.join("\n")
+    logger.info ''
+    logger.info "Run 'cap rubber:bootstrap' if done adding roles"
   end
 
   desc <<-DESC

data/lib/rubber/recipes/rubber/utils.rb

@@ -105,8 +105,8 @@ namespace :rubber do
     slices = []
     servers.each do |rolename, svrs|
       next if svrs.size == 0
-      # figure out size of each slice by deviding server count by # of groups
-      slice_size = svrs.size / (options.delete(:groups) || 2)
+      # figure out size of each slice by dividing server count by # of groups
+      slice_size = (Float(svrs.size) / (options.delete(:groups) || 2)).round
       slice_size = 1 if slice_size == 0
       slice_idx = 0
       svrs.each_slice(slice_size) do |srv_slice|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubber
 version: !ruby/object:Gem::Version 
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors: 
 - Matt Conway
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-06 00:00:00 -05:00
+date: 2009-11-13 00:00:00 -05:00
 default_executable: vulcanize
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,7 +104,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/profile.rc
+- generators/vulcanize/templates/base/config/rubber/common/rubber.profile
 - generators/vulcanize/templates/base/config/rubber/deploy-setup.rb
 - generators/vulcanize/templates/base/config/rubber/rubber-dns.yml
 - generators/vulcanize/templates/base/config/rubber/rubber.yml
@@ -137,6 +137,11 @@ files:
 - generators/vulcanize/templates/haproxy/config/rubber/role/web_tools/haproxy-nginx.conf
 - generators/vulcanize/templates/haproxy/config/rubber/rubber-haproxy.yml
 - generators/vulcanize/templates/haproxy/templates.yml
+- generators/vulcanize/templates/jetty/config/rubber/deploy-jetty.rb
+- generators/vulcanize/templates/jetty/config/rubber/role/jetty/jetty.xml
+- generators/vulcanize/templates/jetty/config/rubber/role/jetty/monit-jetty.conf
+- generators/vulcanize/templates/jetty/config/rubber/rubber-jetty.yml
+- generators/vulcanize/templates/jetty/templates.yml
 - generators/vulcanize/templates/memcached/config/memcached.yml
 - generators/vulcanize/templates/memcached/config/rubber/common/memcached.yml
 - generators/vulcanize/templates/memcached/config/rubber/role/memcached/memcached.conf
@@ -158,6 +163,7 @@ files:
 - generators/vulcanize/templates/monit/templates.yml
 - generators/vulcanize/templates/munin/config/rubber/common/monit-munin.conf
 - generators/vulcanize/templates/munin/config/rubber/common/munin-node.conf
+- generators/vulcanize/templates/munin/config/rubber/common/munin-plugins.conf
 - generators/vulcanize/templates/munin/config/rubber/deploy-munin.rb
 - generators/vulcanize/templates/munin/config/rubber/role/web_tools/munin-nginx.conf
 - generators/vulcanize/templates/munin/config/rubber/role/web_tools/munin-plugins.conf
@@ -200,6 +206,7 @@ files:
 - generators/vulcanize/templates/nginx/config/rubber/rubber-nginx.yml
 - generators/vulcanize/templates/nginx/templates.yml
 - generators/vulcanize/templates/passenger/config/rubber/deploy-passenger.rb
+- generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-memory.conf
 - generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger-sudoers.conf
 - generators/vulcanize/templates/passenger/config/rubber/role/passenger/munin-passenger.conf
 - generators/vulcanize/templates/passenger/config/rubber/role/passenger/passenger-apache-vhost.conf

data/generators/vulcanize/templates/base/config/rubber/common/profile.rc

@@ -1,9 +0,0 @@
-<%
-  @path = "/root/.profile"
-  @additive = ["# rubber-common-start", "# rubber-common-end"]
-%>
-
-# convenience to simply running rails console, etc with correct env
-export RUBBER_ENV=<%= RUBBER_ENV %>
-export RAILS_ENV=<%= RUBBER_ENV %>
-alias current="cd <%= RUBBER_ROOT %>"