sml-rubber 0.9.13 → 1.5.5

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,10 @@
+jetty_version: 7.0.0.v20091005
+jetty_prefix: /opt
+jetty_dir: "#{jetty_prefix}/jetty"
+jetty_port: 8080
+
+jetty_jvm_options: -XX:MaxPermSize=128m
+
+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/memcached/config/rubber/role/memcached/memcached.conf

@@ -1,6 +1,6 @@
 <%
   @path = "/etc/memcached.conf"
-  @post = "/etc/init.d/memcached restart"
+  @post = "service memcached restart"
 %>
 
 # memcached default config file edited for mobicious

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
@@ -21,16 +21,16 @@ namespace :rubber do
     
     
     def mongrel_stop
-        run "cd #{current_path} && mongrel_rails cluster::stop"
+        rsudo "cd #{current_path} && mongrel_rails cluster::stop"
         sleep 5 # Give the graceful stop a chance to complete
-        run "cd #{current_path} && mongrel_rails cluster::stop --force --clean"
+        rsudo "cd #{current_path} && mongrel_rails cluster::stop --force --clean"
     end
     
     def mongrel_start
-        run "cd #{current_path} && mongrel_rails cluster::start --clean"
+        rsudo "cd #{current_path} && mongrel_rails cluster::start --clean"
         pid_cnt = rubber_env.mongrel_count
         logger.info "Waiting for mongrel pid files to show up"
-        run "while ((`ls #{current_path}/tmp/pids/mongrel.*.pid 2> /dev/null | wc -l` < #{pid_cnt})); do sleep 1; done"
+        rsudo "while ((`ls #{current_path}/tmp/pids/mongrel.*.pid 2> /dev/null | wc -l` < #{pid_cnt})); do sleep 1; done"
     end
     
     # serial_task can only be called after roles defined - not normally a problem, but

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/monit/config/rubber/common/monit.conf

@@ -42,6 +42,8 @@ set logfile /var/log/monit.log
 #                backup.bar.baz port 10025,  # backup mailserver on port 10025
 #                localhost                   # fallback relay
 #
+set mailserver localhost
+
 #
 ## By default monit will drop the event alert, in the case that there is no
 ## mailserver available. In the case that you want to keep the events for
@@ -95,7 +97,6 @@ set alert <%= rubber_env.admin_email %> only on {
       gid
       icmp
       invalid
-      match
       nonexist
       permission
       resource

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

@@ -1,6 +1,7 @@
 
 namespace :rubber do
-  
  namespace :monit do
+  
+  namespace :monit do
   
     rubber.allow_optional_tasks(self)
     
@@ -13,12 +14,12 @@ namespace :rubber do
 
     desc "Start monit daemon monitoring"
     task :start do
-      run "/etc/init.d/monit start"
+      rsudo "service monit start"
     end
     
     desc "Stop monit daemon monitoring"
-    task :stop, :on_error => :continue do
-      run "/etc/init.d/monit stop"
+    task :stop do
+      rsudo "service monit stop; exit 0"
     end
     
     desc "Restart monit daemon monitoring"

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

@@ -3,6 +3,6 @@
 %>
 
 check process munin-node with pidfile /var/run/munin/munin-node.pid
-  start program  "/etc/init.d/munin-node start"
-  stop program  "/etc/init.d/munin-node stop"
+  start program  "/usr/bin/env service munin-node start"
+  stop program  "/usr/bin/env service munin-node stop"
   if 5 restarts within 5 cycles then timeout

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

@@ -1,6 +1,6 @@
 <%
   @path = '/etc/munin/munin-node.conf'
-  @post = '/etc/init.d/munin-node restart'
+  @post = 'service munin-node restart'
 %>
 
 #

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

@@ -0,0 +1,11 @@
+<%
+  @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 (rvm env vars, plus paths)
+[*]
+<%- ENV.select {|k, v| k =~ /rvm|ruby|bundler|gem|path/i }.each do |k, v| -%>
+env.<%= k %> <%= v %>
+<%- end -%>
+env.RUBYOPT rubygems

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

@@ -14,8 +14,8 @@ namespace :rubber do
       Reconfigures munin
     DESC
     task :custom_install do
-      rubber.run_script 'setup_munin_plugins', <<-ENDSCRIPT
-        munin-node-configure --shell --remove-also > /tmp/setup-munin-plugins
+      rubber.sudo_script 'setup_munin_plugins', <<-ENDSCRIPT
+        munin-node-configure --shell --remove-also > /tmp/setup-munin-plugins 2> /dev/null || true
         sh /tmp/setup-munin-plugins
       ENDSCRIPT
       restart
@@ -27,12 +27,12 @@ namespace :rubber do
 
     desc "Start munin system monitoring"
     task :start do
-      run "/etc/init.d/munin-node start"
+      rsudo "service munin-node start"
     end
     
     desc "Stop munin system monitoring"
-    task :stop, :on_error => :continue do
-      run "/etc/init.d/munin-node stop"
+    task :stop do
+      rsudo "service munin-node stop; exit 0"
     end
     
     desc "Restart munin system monitoring"

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

@@ -2,7 +2,7 @@
   @path = "/etc/munin/plugin-conf.d/munin-node"
   @additive = ["# rubber-munin-plugins-start", "# rubber-munin-plugins-end"]
   @post = <<-POST
-    /etc/init.d/munin-node restart
+    service munin-node restart
   POST
 
   root = RUBBER_ENV == 'development' ? "#{RUBBER_ROOT}/tmp/rubber" : ""

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 -R munin:munin /var/www/munin"
 %>
 
 # Example configuration file for Munin, generated by 'make build'

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

@@ -1,6 +1,6 @@
 # Uses admin_email from base
 
-packages: [munin-node, munin-plugins-extra]
+packages: [munin-node, munin-plugins-extra, heirloom-mailx]
 
 roles:
   web_tools:

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

@@ -16,8 +16,6 @@ require "rubber"
 env = ENV["RUBBER_ENV"] ||= "development"
 root = File.join(File.dirname(__FILE__), '../..')
 Rubber::initialize(root, env)
-RUBBER_CONFIG = Rubber::Configuration.rubber_env
-RUBBER_INSTANCES = Rubber::Configuration.rubber_instances
 
 # Print config info need by munin for generating graphs
 if ARGV[0] == "config"
@@ -38,15 +36,15 @@ query = <<-EOF
 EOF
 
 # pick a non-critical db if possible
-source = RUBBER_INSTANCES.for_role("mysql_util").first
-source ||= RUBBER_INSTANCES.for_role("mysql_slave").first
-source ||= RUBBER_INSTANCES.for_role("mysql_master").first
+source = Rubber.instances.for_role("mysql_util").first
+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/mysql/config/rubber/common/database.yml

@@ -9,3 +9,4 @@
   username: <%= rubber_env.db_user %>
   password: <%= rubber_env.db_pass %>
   host: <%= rubber_instances.for_role('db', 'primary' => true).first.full_name %>
+  pool: 5

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

@@ -36,14 +36,15 @@ namespace :rubber do
           exists = capture("echo $(ls #{env.db_data_dir}/ 2> /dev/null)")
           if exists.strip.size == 0
             common_bootstrap("mysql_master")
-            sudo "dpkg-reconfigure --frontend=noninteractive mysql-server-5.0"
-            sleep 5
+            
             pass = "identified by '#{env.db_pass}'" if env.db_pass
-            sudo "mysql -u root -e 'create database #{env.db_name};'"
-            sudo "mysql -u root -e \"grant all on *.* to '#{env.db_user}'@'%' #{pass};\""
-            sudo "mysql -u root -e \"grant select on *.* to '#{env.db_slave_user}'@'%' #{pass};\""
-            sudo "mysql -u root -e \"grant replication slave on *.* to '#{env.db_replicator_user}'@'%' #{pass};\""
-            sudo "mysql -u root -e \"flush privileges;\""
+            rubber.sudo_script "create_master_db", <<-ENDSCRIPT
+              mysql -u root -e "create database #{env.db_name};"
+              mysql -u root -e "grant all on *.* to '#{env.db_user}'@'%' #{pass};"
+              mysql -u root -e "grant select on *.* to '#{env.db_slave_user}'@'%' #{pass};"
+              mysql -u root -e "grant replication slave on *.* to '#{env.db_replicator_user}'@'%' #{pass};"
+              mysql -u root -e "flush privileges;"
+            ENDSCRIPT
           end
         end
         send task_name
@@ -57,8 +58,6 @@ namespace :rubber do
           exists = capture("echo $(ls #{env.db_data_dir}/ 2> /dev/null)")
           if exists.strip.size == 0
             common_bootstrap("mysql_slave")
-            sudo "dpkg-reconfigure --frontend=noninteractive mysql-server-5.0"
-            sleep 5
 
             master = rubber_instances.for_role("mysql_master").first
 
@@ -79,22 +78,30 @@ namespace :rubber do
 
             if source == master
               logger.info "Creating slave from a dump of master #{source_host}"
-              sudo "mysql -u root -e \"change master to master_host='#{master_host}', master_user='#{env.db_replicator_user}' #{master_pass}\""
-              sudo "mysqldump -u #{env.db_user} #{pass} -h #{source_host} --all-databases --master-data=1 | mysql -u root"
+              rubber.sudo_script "create_slave_db_from_master", <<-ENDSCRIPT
+                mysql -u root -e "change master to master_host='#{master_host}', master_user='#{env.db_replicator_user}' #{master_pass}"
+                mysqldump -u #{env.db_user} #{env.db_pass.nil? ? '' : '--password ' + env.db_pass} -h #{source_host} --all-databases --master-data=1 | mysql -u root
+              ENDSCRIPT
             else
               logger.info "Creating slave from a dump of slave #{source_host}"
-              sudo "mysql -u #{env.db_user} #{pass} -h #{source_host} -e \"stop slave;\""
+              rsudo "mysql -u #{env.db_user} --password #{env.db_pass} -h #{source_host} -e \"stop slave;\""
               slave_status = capture("mysql -u #{env.db_user} #{pass} -h #{source_host} -e \"show slave status\\G\"")
               slave_config = Hash[*slave_status.scan(/([^\s:]+): ([^\s]*)/).flatten]
               log_file = slave_config['Master_Log_File']
               log_pos = slave_config['Read_Master_Log_Pos']
-              sudo "mysqldump -u #{env.db_user} #{pass} -h #{source_host} --all-databases --master-data=1 | mysql -u root"
-              sudo "mysql -u root -e \"change master to master_host='#{master_host}', master_user='#{env.db_replicator_user}', master_log_file='#{log_file}', master_log_pos=#{log_pos} #{master_pass}\""
-              sudo "mysql -u #{env.db_user} #{pass} -h #{source_host} -e \"start slave;\""
+              rubber.sudo_script "create_slave_db_from_slave", <<-ENDSCRIPT
+                mysqldump -u #{env.db_user} --password #{env.db_pass} -h #{source_host} --all-databases --master-data=1 | mysql -u root
+                mysql -u root -e "change master to master_host='#{master_host}', master_user='#{env.db_replicator_user}', master_log_file='#{log_file}', master_log_pos=#{log_pos} #{master_pass}"
+                mysql -u #{env.db_user} --password #{env.db_pass} -h #{source_host} -e "start slave;"
+              ENDSCRIPT
             end
 
-            sudo "mysql -u root -e \"flush privileges;\""
-            sudo "mysql -u root -e \"start slave;\""
+            # this doesn't work without agent forwarding which sudo breaks, as well as not having your
+            # ec2 private key ssh-added on workstation
+            # sudo "scp -o \"StrictHostKeyChecking=no\" #{source_host}:/etc/mysql/debian.cnf /etc/mysql"
+
+            rsudo "mysql -u root -e \"flush privileges;\""
+            rsudo "mysql -u root -e \"start slave;\""
           end
         end
         send task_name
@@ -105,15 +112,21 @@ namespace :rubber do
     # TODO: Make the setup/update happen just once per host
     def common_bootstrap(role)
       # mysql package install starts mysql, so stop it
-      sudo "/etc/init.d/mysql stop" rescue nil
+      rsudo "service mysql stop" rescue nil
       
       # After everything installed on machines, we need the source tree
       # on hosts in order to run rubber:config for bootstrapping the db
-      deploy.setup
-      deploy.update_code
+      rubber.update_code_for_bootstrap
       
       # Gen just the conf for the given mysql role
-      rubber.run_config(:RUBBER_ENV => RUBBER_ENV, :FILE => "role/#{role}|role/db/my.cnf", :deploy_path => release_path)
+      rubber.run_config(:RUBBER_ENV => RUBBER_ENV, :FILE => "role/#{role}|role/db/", :FORCE => true, :deploy_path => release_path)
+
+      # reconfigure mysql so that it sets up data dir in /mnt with correct files
+      sudo_script 'reconfigure-mysql', <<-ENDSCRIPT
+        server_package=`dpkg -l | grep mysql-server-[0-9] | awk '{print $2}'`
+        dpkg-reconfigure --frontend=noninteractive $server_package
+      ENDSCRIPT
+      sleep 5
     end
     
     before "rubber:munin:custom_install", "rubber:mysql:custom_install_munin"
@@ -122,10 +135,10 @@ namespace :rubber do
       Installs some extra munin graphs
     DESC
     task :custom_install_munin, :roles => [:mysql_master, :mysql_slave] do
-      rubber.run_script 'install_munin_mysql', <<-ENDSCRIPT
+      rubber.sudo_script 'install_munin_mysql', <<-ENDSCRIPT
         if [ ! -f /usr/share/munin/plugins/mysql_ ]; then
-          wget -q -O /usr/share/munin/plugins/mysql_ http://github.com/kjellm/munin-mysql/raw/master/mysql_
-          wget -q -O /etc/munin/plugin-conf.d/mysql_.conf http://github.com/kjellm/munin-mysql/raw/master/mysql_.conf
+          wget -qN -O /usr/share/munin/plugins/mysql_ http://github.com/kjellm/munin-mysql/raw/master/mysql_
+          wget -qN -O /etc/munin/plugin-conf.d/mysql_.conf http://github.com/kjellm/munin-mysql/raw/master/mysql_.conf
         fi
       ENDSCRIPT
     end
@@ -134,21 +147,21 @@ namespace :rubber do
       Starts the mysql daemons
     DESC
     task :start, :roles => [:mysql_master, :mysql_slave] do
-      sudo "/etc/init.d/mysql start"
+      rsudo "service mysql start"
     end
     
     desc <<-DESC
       Stops the mysql daemons
     DESC
     task :stop, :roles => [:mysql_master, :mysql_slave] do
-      sudo "/etc/init.d/mysql stop"
+      rsudo "service mysql stop"
     end
   
     desc <<-DESC
       Restarts the mysql daemons
     DESC
     task :restart, :roles => [:mysql_master, :mysql_slave] do
-      sudo "/etc/init.d/mysql restart"
+      rsudo "service mysql restart"
     end
   
   end