nirvdrum-rubber 1.1.7 → 2.0.0.rails3.beta6

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

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

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

data/generators/vulcanize/templates/mysql/config/rubber/role/db/apparmor-mysql.conf

@@ -0,0 +1,46 @@
+<%
+  @path = '/etc/apparmor.d/usr.sbin.mysqld'
+  @post = "service apparmor restart"
+  @backup = false
+%>
+
+#include <tunables/global>
+
+/usr/sbin/mysqld {
+  #include <abstractions/base>
+  #include <abstractions/nameservice>
+  #include <abstractions/user-tmp>
+  #include <abstractions/mysql>
+  #include <abstractions/winbind>
+
+  capability dac_override,
+  capability sys_resource,
+  capability setgid,
+  capability setuid,
+
+  network tcp,
+
+  /etc/hosts.allow r,
+  /etc/hosts.deny r,
+
+  /etc/mysql/*.pem r,
+  /etc/mysql/conf.d/ r,
+  /etc/mysql/conf.d/* r,
+  /etc/mysql/my.cnf r,
+  /usr/sbin/mysqld mr,
+  /usr/share/mysql/** r,
+  /var/log/mysql.log rw,
+  /var/log/mysql.err rw,
+  /var/lib/mysql/ r,
+  /var/lib/mysql/** rwk,
+  /var/log/mysql/ r,
+  /var/log/mysql/* rw,
+  /var/run/mysqld/mysqld.pid w,
+  /var/run/mysqld/mysqld.sock w,
+
+  /sys/devices/system/cpu/ r,
+  /sys/devices/system/cpu/** r,
+
+  <%= rubber_env.db_root_dir %>/ r,
+  <%= rubber_env.db_root_dir %>/** rwk,
+}

data/generators/vulcanize/templates/mysql/config/rubber/role/db/monit-mysql.cnf

@@ -4,7 +4,7 @@
 
 check process mysql with pidfile /var/run/mysqld/mysqld.pid
    group mysql-<%= RUBBER_ENV %>
-   start program = "/etc/init.d/mysql restart"
-   stop program = "/etc/init.d/mysql stop"
+   start program = "/usr/sbin/service mysql restart"
+   stop program = "/usr/sbin/service mysql stop"
    if failed host 127.0.0.1 port 3306 protocol mysql then alert
    if 5 restarts within 5 cycles then timeout

data/generators/vulcanize/templates/mysql/config/rubber/role/db/my.cnf

@@ -102,12 +102,8 @@ expire_logs_days  = 10
 max_binlog_size         = 100M
 #binlog_do_db   = include_database_name
 #binlog_ignore_db = include_database_name
-#
-# * BerkeleyDB
-#
-# Using BerkeleyDB is now discouraged as its support will cease in 5.1.12.
-skip-bdb
-#
+
+
 # * InnoDB
 #
 # InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.

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

@@ -31,7 +31,8 @@ role_dependencies:
   db:primary=true: [mysql_master]
   db: [mysql_slave]
 
-packages: [mysql-client, libmysql-ruby]
+packages: [mysql-client, libmysqlclient15-dev]
+gems: [mysql]
 
 roles:
   mysql_master:

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

@@ -46,12 +46,11 @@ namespace :rubber do
   
     task :bootstrap, :roles => [:mysql_mgm, :mysql_data, :mysql_sql] do
       # 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
   
       # Conditionaly bootstrap for each node/role only if that node has not
       # been boostrapped for that role before
@@ -62,7 +61,7 @@ namespace :rubber do
           exists = capture("if grep -c rubber.*mysql_mgm /etc/mysql/ndb_mgmd.cnf &> /dev/null; then echo exists; fi")
           if exists.strip.size == 0
             rubber.run_config(:RUBBER_ENV => RUBBER_ENV, :FILE => "role/mysql_mgm", :deploy_path => release_path)
-            sudo "/etc/init.d/mysql-ndb-mgm start"
+            rsudo "service mysql-ndb-mgm start"
           end
         end
         send task_name
@@ -74,7 +73,7 @@ namespace :rubber do
           exists = capture("if grep -c rubber.*mysql_data /etc/mysql/my.cnf &> /dev/null; then echo exists; fi")
           if exists.strip.size == 0
             rubber.run_config(:RUBBER_ENV => RUBBER_ENV, :FILE => "role/mysql_data", :deploy_path => release_path)
-            sudo "/etc/init.d/mysql-ndb start-initial"
+            rsudo "service mysql-ndb start-initial"
           end
         end
         send task_name
@@ -86,13 +85,18 @@ namespace :rubber do
           exists = capture("if grep -c rubber.*mysql_sql /etc/mysql/my.cnf &> /dev/null; then echo exists; fi")
           if exists.strip.size == 0
             rubber.run_config(:RUBBER_ENV => RUBBER_ENV, :FILE => "role/mysql_sql", :deploy_path => release_path)
-            sudo "/etc/init.d/mysql start"
+            rsudo "service mysql start"
             env = rubber_cfg.environment.bind()
             # For mysql 5.0 cluster, need to create users and database for EVERY sql node
             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 #{env.db_name}.* to '#{env.db_user}'@'%' #{pass};\""
-            sudo "mysql -u root -e \"update user set Super_priv = 'N' where user = '#{env.db_user}';\" mysql"
+            rubber.sudo_script "create_mysql_sql_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
@@ -104,42 +108,42 @@ namespace :rubber do
       Starts the mysql cluster management daemon on the management node
     DESC
     task :start_mgm, :roles => :mysql_mgm do
-      sudo "/etc/init.d/mysql-ndb-mgm start"
+      rsudo "service mysql-ndb-mgm start"
     end
     
     desc <<-DESC
       Starts the mysql cluster storage daemon on the data nodes
     DESC
     task :start_data, :roles => :mysql_data do
-      sudo "/etc/init.d/mysql-ndb start"
+      rsudo "service mysql-ndb start"
     end
     
     desc <<-DESC
       Starts the mysql cluster sql daemon on the sql nodes
     DESC
     task :start_sql, :roles => :mysql_sql do
-      sudo "/etc/init.d/mysql start"
+      rsudo "service mysql start"
     end
     
     desc <<-DESC
       Stops the mysql cluster management daemon on the management node
     DESC
     task :stop_mgm, :roles => :mysql_mgm do
-      sudo "/etc/init.d/mysql-ndb-mgm stop"
+      rsudo "service mysql-ndb-mgm stop"
     end
     
     desc <<-DESC
       Stops the mysql cluster storage daemon on the data nodes
     DESC
     task :stop_data, :roles => :mysql_data do
-      sudo "/etc/init.d/mysql-ndb stop"
+      rsudo "service mysql-ndb stop"
     end
     
     desc <<-DESC
       Stops the mysql cluster sql daemon on the sql nodes
     DESC
     task :stop_sql, :roles => :mysql_sql do
-      sudo "/etc/init.d/mysql stop"
+      rsudo "service mysql stop"
     end
   
     desc <<-DESC

data/generators/vulcanize/templates/mysql_cluster/config/rubber/role/mysql_sql/monit-mysql_cluster_sql.cnf

@@ -4,7 +4,7 @@
 
 check process mysql_cluster_sql with pidfile /var/lib/mysql/<%= rubber_env.full_host %>.pid
    group mysql_cluster_sql-<%= RUBBER_ENV %>
-   start program = "/etc/init.d/mysql start"
-   stop program = "/etc/init.d/mysql stop"
+   start program = "/usr/sbin/service mysql start"
+   stop program = "/usr/sbin/service mysql stop"
    if failed host 127.0.0.1 port 3306 protocol mysql then alert
    if 5 restarts within 5 cycles then timeout

data/generators/vulcanize/templates/mysql_proxy/config/rubber/common/monit-mysql_proxy.cnf

@@ -4,7 +4,7 @@
 
 check process mysql_proxy with pidfile /var/run/mysql-proxy.pid
    group mysql_proxy-<%= RUBBER_ENV %>
-   start program = "/etc/init.d/mysql-proxy start"
-   stop program = "/etc/init.d/mysql-proxy stop"
+   start program = "/usr/sbin/service mysql-proxy start"
+   stop program = "/usr/sbin/service mysql-proxy stop"
    if failed host 127.0.0.1 port 4040 protocol mysql then alert
    if 5 restarts within 5 cycles then timeout

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

@@ -29,21 +29,21 @@ namespace :rubber do
       Starts the mysql proxy daemon
     DESC
     task :start do
-      sudo "/etc/init.d/mysql-proxy start"
+      rsudo "service mysql-proxy start"
     end
     
     desc <<-DESC
       Stops the mysql proxy daemon
     DESC
     task :stop do
-      sudo "/etc/init.d/mysql-proxy stop"
+      rsudo "service mysql-proxy stop"
     end
     
     desc <<-DESC
       Restarts the mysql proxy daemon
     DESC
     task :restart do
-      sudo "/etc/init.d/mysql-proxy restart"
+      rsudo "service mysql-proxy restart"
     end
     
     

data/generators/vulcanize/templates/nginx/config/rubber/deploy-nginx.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 => :nginx do
-        run "/etc/init.d/nginx restart"
+        rsudo "service nginx restart"
       end
       rubber.serial_task self, :serial_reload, :roles => :nginx do
-        run "if ! ps ax | grep -v grep | grep -c nginx &> /dev/null; then /etc/init.d/nginx start; else /etc/init.d/nginx reload; fi"
+        rsudo "if ! ps ax | grep -v grep | grep -c nginx &> /dev/null; then service nginx start; else service nginx reload; fi"
       end
     end
     
@@ -21,13 +21,13 @@ namespace :rubber do
     after "deploy:restart", "rubber:nginx:reload"
     
     desc "Stops the nginx web server"
-    task :stop, :roles => :nginx, :on_error => :continue do
-      run "/etc/init.d/nginx stop"
+    task :stop, :roles => :nginx do
+      rsudo "service nginx stop; exit 0"
     end
     
     desc "Starts the nginx web server"
     task :start, :roles => :nginx do
-      run "/etc/init.d/nginx start"
+      rsudo "service nginx start"
     end
     
     desc "Restarts the nginx web server"

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

@@ -4,5 +4,5 @@
 <% PIDFILE = "/var/run/nginx.pid" %>
 check process nginx with pidfile <%= PIDFILE %>
   group nginx-<%= RUBBER_ENV %>
-  start program = "/etc/init.d/nginx start"
-  stop program = "/etc/init.d/nginx stop"
+  start program = "/usr/sbin/service nginx start"
+  stop program = "/usr/sbin/service nginx stop"

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

@@ -11,6 +11,7 @@ namespace :rubber do
       rubber.sudo_script 'install_passenger', <<-ENDSCRIPT
         if [[ -z `ls #{rubber_env.passenger_lib} 2> /dev/null` ]]; then
           echo -en "\n\n\n\n" | passenger-install-apache2-module
+          rvm #{rubber_env.rvm_ruby} --passenger
         fi
       ENDSCRIPT
     end
@@ -18,7 +19,15 @@ namespace :rubber do
     after "rubber:setup_app_permissions", "rubber:passenger:setup_passenger_permissions"
 
     task :setup_passenger_permissions, :roles => :passenger do
-      run "chown #{rubber_env.app_user}:#{rubber_env.app_user} #{current_path}/config/environment.rb"
+      rsudo "chown #{rubber_env.app_user}:#{rubber_env.app_user} #{current_path}/config/environment.rb"
+    end
+
+    # passenger does things differently for rack apps, so if this is a rails app, remove config.ru
+    # to stop passenger from treating this like a rack app
+    after "deploy:update_code", "rubber:passenger:remove_config_ru" if Rubber::Util.is_rails?
+
+    task :remove_config_ru, :roles => :passenger do
+      rsudo "rm -f  #{current_release}/config.ru"
     end
 
     # passenger depends on apache for start/stop/restart, just need these defined

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

@@ -18,7 +18,7 @@ END
 end
 
 def output_values
-  status = `sudo <%= rubber_env.ruby_prefix %>/bin/passenger-memory-stats | tail -1`
+  status = `sudo <%= ENV['GEM_HOME'] %>/bin/passenger-memory-stats | tail -1`
   unless $?.success?
     $stderr.puts "failed executing passenger-memory-stats"
     exit 1