rubber 1.3.2 → 1.5.0

data/generators/vulcanize/templates/cassandra/config/rubber/role/cassandra/log4j-server.properties

@@ -0,0 +1,45 @@
+<%
+  @path = "#{rubber_env.cassandra_dir}/conf/log4j-server.properties"
+%>
+
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# for production, you should probably set the root to INFO
+# and the pattern to %c instead of %l.  (%l is slower.)
+
+# output messages into a rolling log file as well as stdout
+log4j.rootLogger=INFO,stdout,R
+
+# stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n
+
+# rolling log file
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.file.maxFileSize=20MB
+log4j.appender.file.maxBackupIndex=50
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%5p [%t] %d{ISO8601} %F (line %L) %m%n
+# Edit the next line to point to your logs directory
+log4j.appender.R.File=<%= rubber_env.cassandra_log_dir %>/system.log
+
+# Application logging options
+#log4j.logger.com.facebook=DEBUG
+#log4j.logger.com.facebook.infrastructure.gms=DEBUG
+#log4j.logger.com.facebook.infrastructure.db=DEBUG

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

@@ -0,0 +1,8 @@
+<%
+  @path = '/etc/monit/monit.d/monit-cassandra.conf'
+%>
+check process cassandra with pidfile <%= rubber_env.cassandra_pid_file %>
+  group cassandra-<%= RUBBER_ENV %>
+  start program = "<%= rubber_env.cassandra_dir %>/bin/cassandra -p <%= rubber_env.cassandra_pid_file %>"
+  stop program = "kill `cat <%= rubber_env.cassandra_pid_file %>`"
+  if failed host <%= rubber_env.host %> port <%= rubber_env.cassandra_rpc_port %> with timeout 10 seconds for 10 cycles then restart

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

@@ -0,0 +1,18 @@
+cassandra_version: 2010-05-05_14-04-54
+cassandra_prefix: /usr/local
+cassandra_dir: "#{cassandra_prefix}/apache-cassandra-#{cassandra_version}"
+cassandra_data_dir: "/var/lib/cassandra/data"
+cassandra_commitlog_dir: "/var/lib/cassandra/commitlog"
+cassandra_log_dir: "/var/log/cassandra"
+cassandra_pid_file: "/var/run/cassandra.pid"
+cassandra_pkg_url: "http://hudson.zones.apache.org/hudson/job/Cassandra/lastSuccessfulBuild/artifact/cassandra/build/apache-cassandra-#{cassandra_version}-bin.tar.gz"
+cassandra_rpc_port: 9160
+cassandra_storage_port: 7070
+cassandra_jmx_port: 8181
+
+role_dependencies:
+  cassandra_seed: [cassandra]
+  
+roles:
+  cassandra:
+    packages: [openjdk-6-jdk]

data/generators/vulcanize/templates/cassandra/templates.yml

@@ -0,0 +1 @@
+description: The Cassandra distributed data store 

data/generators/vulcanize/templates/{complete_passenger_mysql → complete_passenger}/config/rubber/role/haproxy/haproxy-passenger.conf

@@ -13,7 +13,7 @@ listen passenger_proxy 0.0.0.0:<%= rubber_env.web_port %>
     server <%= server %> <%= server %>:<%= rubber_env.passenger_listen_port %> maxconn <%= rubber_env.max_app_connections %> check
   <% end %>
 
-listen passenger_proxy 0.0.0.0:<%= rubber_env.web_ssl_port %>
+listen passenger_proxy_ssl 0.0.0.0:<%= rubber_env.web_ssl_port %>
   mode tcp
   option forwardfor
   <% backend_hosts.each do |server| %>

data/generators/vulcanize/templates/complete_passenger/templates.rb

@@ -0,0 +1,9 @@
+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/templates.yml

@@ -0,0 +1,9 @@
+description: A fairly complete and scalable deployment setup
+dependent_templates:
+  - base
+  - haproxy
+  - apache
+  - passenger
+  - monit
+  - munin
+  - memcached

data/generators/vulcanize/templates/complete_passenger_mysql/templates.yml

@@ -1,10 +1,4 @@
 description: A fairly complete and scalable mysql deployment setup
 dependent_templates:
-  - base
+  - complete_passenger
   - mysql
-  - haproxy
-  - apache
-  - passenger
-  - monit
-  - munin
-  - memcached

data/generators/vulcanize/templates/complete_passenger_postgresql/templates.yml

@@ -0,0 +1,4 @@
+description: A fairly complete and scalable postgresql deployment setup
+dependent_templates:
+  - complete_passenger
+  - postgresql

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

@@ -54,12 +54,12 @@ namespace :rubber do
 
     desc "Start cruise control daemon"
     task :start, :roles => :cruise do
-      sudo "/etc/init.d/cruise start"
+      rsudo "/etc/init.d/cruise start"
     end
     
     desc "Stop cruise control daemon"
-    task :stop, :roles => :cruise, :on_error => :continue do
-      sudo "/etc/init.d/cruise stop"
+    task :stop, :roles => :cruise do
+      rsudo "/etc/init.d/cruise stop; exit 0"
     end
     
     desc "Restart cruise control daemon"

data/generators/vulcanize/templates/cruise/config/rubber/role/cruise/my.cnf

@@ -1,6 +1,6 @@
 <%
   @path = '/etc/mysql/my.cnf'
-  @post = '/etc/init.d/mysql restart'
+  @post = 'service mysql restart'
 %>
 
 # Generated by rubber for host <%= rubber_instances[rubber_env.host].external_ip %>

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

@@ -9,10 +9,10 @@ namespace :rubber do
     # rubber auto-roles don't get defined till after all tasks are defined
     on :load do
       rubber.serial_task self, :serial_restart, :roles => :haproxy do
-        sudo "/etc/init.d/haproxy restart"
+        rsudo "service haproxy restart"
       end
       rubber.serial_task self, :serial_reload, :roles => :haproxy do
-        sudo "sh -c 'if ! ps ax | grep -v grep | grep -c haproxy &> /dev/null; then /etc/init.d/haproxy start; else /etc/init.d/haproxy reload; fi'"
+        rsudo "if ! ps ax | grep -v grep | grep -c haproxy &> /dev/null; then service haproxy start; else service haproxy reload; fi"
       end
     end
     
@@ -21,13 +21,13 @@ namespace :rubber do
     after "deploy:restart", "rubber:haproxy:reload"
     
     desc "Stops the haproxy server"
-    task :stop, :roles => :haproxy, :on_error => :continue do
-      sudo "/etc/init.d/haproxy stop"
+    task :stop, :roles => :haproxy do
+      rsudo "service haproxy stop; exit 0"
     end
     
     desc "Starts the haproxy server"
     task :start, :roles => :haproxy do
-      sudo "/etc/init.d/haproxy start"
+      rsudo "service haproxy start"
     end
     
     desc "Restarts the haproxy server"

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

@@ -4,6 +4,6 @@
 <% PIDFILE = "/var/run/haproxy.pid" %>
 check process haproxy with pidfile <%= PIDFILE %>
   group haproxy-<%= RUBBER_ENV %>
-  start program = "/etc/init.d/haproxy start"
-  stop program = "/etc/init.d/haproxy stop"
+  start program = "/usr/sbin/service haproxy start"
+  stop program = "/usr/sbin/service haproxy stop"
   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/haproxy/config/rubber/role/haproxy/syslog-haproxy.conf

@@ -2,7 +2,7 @@
   is_rsyslog = File.exist?('/etc/init.d/rsyslog')
   if is_rsyslog
     @path = "/etc/rsyslog.d/haproxy.conf"
-    @post = "/etc/init.d/rsyslog restart"
+    @post = "service rsyslog restart"
   else
     @path = "/etc/syslog.conf"
     @post = "/etc/init.d/sysklogd restart"

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

@@ -36,7 +36,7 @@ namespace :rubber do
     after "rubber:setup_app_permissions", "rubber:jetty:setup_jetty_permissions"
 
     task :setup_jetty_permissions, :roles => :jetty do
-      sudo "chown -R #{rubber_env.app_user}:#{rubber_env.app_user} #{rubber_env.jetty_dir}"
+      rsudo "chown -R #{rubber_env.app_user}:#{rubber_env.app_user} #{rubber_env.jetty_dir}"
     end
     
     before "deploy:stop", "rubber:jetty:stop"
@@ -44,15 +44,15 @@ namespace :rubber do
     after "deploy:restart", "rubber:jetty:restart"
     
     task :restart, :roles => :jetty do
-      sudo "#{rubber_env.jetty_dir}/bin/jetty.sh restart"
+      rsudo "#{rubber_env.jetty_dir}/bin/jetty.sh restart"
     end
     
     task :stop, :roles => :jetty do
-      sudo "#{rubber_env.jetty_dir}/bin/jetty.sh stop"
+      rsudo "#{rubber_env.jetty_dir}/bin/jetty.sh stop"
     end
     
     task :start, :roles => :jetty do
-      sudo "#{rubber_env.jetty_dir}/bin/jetty.sh start"
+      rsudo "#{rubber_env.jetty_dir}/bin/jetty.sh start"
     end
     
   end

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

@@ -21,16 +21,16 @@ namespace :rubber do
     
     
     def mongrel_stop
-        sudo "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
-        sudo "cd #{current_path} && mongrel_rails cluster::stop --force --clean"
+        rsudo "cd #{current_path} && mongrel_rails cluster::stop --force --clean"
     end
     
     def mongrel_start
-        sudo "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"
-        sudo "sh -c '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/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

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

@@ -14,12 +14,12 @@ namespace :rubber do
 
     desc "Start monit daemon monitoring"
     task :start do
-      sudo "/etc/init.d/monit start"
+      rsudo "service monit start"
     end
     
     desc "Stop monit daemon monitoring"
-    task :stop, :on_error => :continue do
-      sudo "/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/sbin/service munin-node start"
+  stop program  "/usr/sbin/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

@@ -3,7 +3,9 @@
 %>
 
 # 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)
+# to make sure we are running the correct ruby (rvm env vars, plus paths)
 [*]
-env.PATH /sbin:/usr/sbin:/usr/local/sbin:<%= rubber_env.ruby_prefix %>/bin:/usr/local/bin:/usr/bin:/bin
+<%- 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

@@ -15,7 +15,7 @@ namespace :rubber do
     DESC
     task :custom_install do
       rubber.sudo_script 'setup_munin_plugins', <<-ENDSCRIPT
-        munin-node-configure --shell --remove-also > /tmp/setup-munin-plugins
+        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
-      sudo "/etc/init.d/munin-node start"
+      rsudo "service munin-node start"
     end
     
     desc "Stop munin system monitoring"
-    task :stop, :on_error => :continue do
-      sudo "/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" : ""
@@ -22,7 +22,7 @@
     File.open("#{plugin_dir}/#{plugin_name}", 'w') do |p|
       p.chmod(0755)
       p.puts('#!/bin/sh')
-      p.puts("RUBBER_ENV=#{RUBBER_ENV} #{rubber_env.ruby_prefix}/bin/ruby #{script} $*")
+      p.puts("RUBBER_ENV=#{RUBBER_ENV} #{script} $*")
     end
   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 -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, mailx]
+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_CONFIG.db_slave_user}"
-command << " --password=#{RUBBER_CONFIG.db_pass}"
+command = "mysql -u #{Rubber.config.db_slave_user}"
+command << " --password=#{Rubber.config.db_pass}"
 command << " -h #{db_host}"
-command << " #{RUBBER_CONFIG.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

@@ -38,11 +38,13 @@ namespace :rubber do
             common_bootstrap("mysql_master")
             
             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
@@ -76,26 +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 "sh -c '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} --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 "sh -c '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
 
             # 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"
 
-            sudo "mysql -u root -e \"flush privileges;\""
-            sudo "mysql -u root -e \"start slave;\""
+            rsudo "mysql -u root -e \"flush privileges;\""
+            rsudo "mysql -u root -e \"start slave;\""
           end
         end
         send task_name
@@ -106,12 +112,11 @@ 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/", :FORCE => true, :deploy_path => release_path)
@@ -142,112 +147,22 @@ 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
-
-    desc <<-DESC
-      Backup production database using rake task rubber:backup_db
-    DESC
-    task :backup, :roles => [:mysql_master, :mysql_slave] do
-      master_instances = rubber_instances.for_role("mysql_master")
-      slaves = rubber_instances.for_role("mysql_slave")
-
-      # Select only one instance for backup.  Favor slave database.
-      selected_mysql_instance = (slaves+master_instances).first
-            
-      task_name = "_backup_mysql_slave_#{selected_mysql_instance.full_name}".to_sym()
-      task task_name, :hosts => selected_mysql_instance.full_name do
-        run "cd #{current_path} && RUBBER_ENV=production RAILS_ENV=production RUBYOPT=rubygems BACKUP_DIR=/mnt/db_backups DBUSER=#{rubber_env.db_user} DBPASS=#{rubber_env.db_pass} DBNAME=#{rubber_env.db_name} DBHOST=#{selected_mysql_instance.full_name} rake rubber:backup_db"
-      end
-      send task_name
-    end
-    
-    desc <<-DESC
-      Restore production database from s3 using rake task rubber:restore_db_s3
-    DESC
-    task :restore_s3, :roles => [:mysql_master, :mysql_slave] do
-      master_instances = rubber_instances.for_role("mysql_master")
-      slaves = rubber_instances.for_role("mysql_slave")
-
-      for instance in master_instances+slaves
-        task_name = "_restore_mysql_s3_#{instance.full_name}".to_sym()
-        task task_name, :hosts => instance.full_name do
-          run "cd #{current_path} && RUBBER_ENV=production RAILS_ENV=production RUBYOPT=rubygems BACKUP_DIR=/mnt/db_backups DBUSER=#{rubber_env.db_user} DBPASS=#{rubber_env.db_pass} DBNAME=#{rubber_env.db_name} DBHOST=#{instance.full_name} rake rubber:restore_db_s3"
-        end
-        send task_name
-      end
-    end    
-    
-    desc <<-DESC
-      Overwrite ec2 production database with export from local production database.
-    DESC
-    task :local_to_ec2, :roles => [:mysql_master, :mysql_slave] do
-      require 'yaml'      
-      master_instances = rubber_instances.for_role("mysql_master")
-      slaves = rubber_instances.for_role("mysql_slave")
-
-      # Select only one instance for backup.  Favor slave database.
-      selected_mysql_instance = (slaves+master_instances).first
-            
-      task_name = "_load_local_to_#{selected_mysql_instance.full_name}".to_sym()
-      task task_name, :hosts => selected_mysql_instance.full_name do
-
-        # Dump Local to tmp folder
-        filename = "#{application}.local.#{Time.now.to_i}.sql.gz" 
-        backup_file = "/tmp/#{filename}" 
-        on_rollback { delete file }
-        FileUtils.mkdir_p(File.dirname(backup_file))
-
-        # Use database.yml to get connection params
-        db = YAML::load(ERB.new(IO.read(File.join(File.dirname(__FILE__), '..','database.yml'))).result)['production']
-        user = db['username']
-        pass = db['passsword']
-        pass = nil if pass and pass.strip.size == 0
-        host = db['host']
-        name = db['database']
-        
-        raise "No db_backup_cmd defined in rubber.yml, cannot backup!" unless rubber_env.db_backup_cmd
-        db_backup_cmd = rubber_env.db_backup_cmd.gsub(/%([^%]+)%/, '#{\1}')
-        db_backup_cmd = eval('%Q{' + db_backup_cmd + '}')
-
-        # mysqldump (or backup app) needs to be in your path
-        puts "Backing up database with command:"
-        system(db_backup_cmd)
-        puts "Created backup: #{backup_file}"
-
-        # Upload Local to S3
-        cloud_provider = rubber_env.cloud_providers[rubber_env.cloud_provider]
-        s3_prefix = "db/"
-        backup_bucket = cloud_provider.backup_bucket
-        if backup_bucket
-          AWS::S3::Base.establish_connection!(:access_key_id => cloud_provider.access_key, :secret_access_key => cloud_provider.secret_access_key)
-          unless AWS::S3::Bucket.list.find { |b| b.name == backup_bucket }
-            AWS::S3::Bucket.create(backup_bucket)
-          end
-          dest = "#{s3_prefix}#{File.basename(backup_file)}"
-          puts "Saving db dump to S3: #{backup_bucket}:#{dest}"
-          AWS::S3::S3Object.store(dest, open(backup_file), backup_bucket)
-        end
-        
-        send :restore_s3
-
-      end
-      send task_name
-    end    
   
   end