axtro-rubber 1.2.3 → 1.5.7

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
-        run "/etc/init.d/haproxy restart"
+        rsudo "service haproxy restart"
       end
       rubber.serial_task self, :serial_reload, :roles => :haproxy do
-        run "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
-      run "/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
-      run "/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/bin/env service haproxy start"
+  stop program = "/usr/bin/env service haproxy stop"
   if failed host <%= rubber_env.host %> port <%= rubber_env.haproxy_monitor_port %> with timeout 10 seconds for 10 cycles then restart

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

@@ -1,6 +1,11 @@
 <%
-  @path = "/etc/syslog.conf"
-  @post = "/etc/init.d/sysklogd restart"
-  @additive = ["# rubber-haproxy-start", "# rubber-haproxy-end"]
+  is_rsyslog = File.exist?('/etc/init.d/rsyslog')
+  if is_rsyslog
+    @path = "/etc/rsyslog.d/haproxy.conf"
+    @post = "service rsyslog restart"
+  else
+    @path = "/etc/syslog.conf"
+    @post = "/etc/init.d/sysklogd restart"
+  end
 %>
 local0.* /var/log/haproxy.log

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

@@ -1,7 +1,11 @@
 <%
+  is_rsyslog = File.exist?('/etc/init.d/rsyslog')
+  @skip = is_rsyslog
   @path = "/etc/default/syslogd"
   @post = "/etc/init.d/sysklogd restart"
 %>
+# This file goes away once we remove backward compatibility for sysklog
+# in alestic AMIs
 #
 # Top configuration file for syslogd
 #

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

@@ -10,7 +10,7 @@ namespace :rubber do
     task :custom_install, :roles => :jetty do
       rubber.sudo_script 'install_jetty', <<-ENDSCRIPT
         if [[ -z `ls #{rubber_env.jetty_prefix}/jetty-hightide-#{rubber_env.jetty_version} 2> /dev/null` ]]; then
-          wget -q http://dist.codehaus.org/jetty/jetty-hightide-7.0.0/jetty-hightide-#{rubber_env.jetty_version}.tar.gz
+          wget -qN http://dist.codehaus.org/jetty/jetty-hightide-7.0.0/jetty-hightide-#{rubber_env.jetty_version}.tar.gz
           tar -zxf jetty-hightide-#{rubber_env.jetty_version}.tar.gz
           
           # Install to appropriate location.
@@ -36,7 +36,7 @@ namespace :rubber do
     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}"
+      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
-      run "#{rubber_env.jetty_dir}/bin/jetty.sh restart"
+      rsudo "#{rubber_env.jetty_dir}/bin/jetty.sh restart"
     end
     
     task :stop, :roles => :jetty do
-      run "#{rubber_env.jetty_dir}/bin/jetty.sh stop"
+      rsudo "#{rubber_env.jetty_dir}/bin/jetty.sh stop"
     end
     
     task :start, :roles => :jetty do
-      run "#{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

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

@@ -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

@@ -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

@@ -5,33 +5,68 @@
 # 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/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

@@ -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