rubber 1.3.2 → 1.5.0

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

@@ -1,6 +1,6 @@
 <%
   @path = '/etc/apparmor.d/usr.sbin.mysqld'
-  @post = "/etc/init.d/apparmor restart"
+  @post = "service apparmor restart"
   @backup = false
 %>
 

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/rubber-mysql.yml

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

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
-        sudo "/etc/init.d/nginx restart"
+        rsudo "service nginx restart"
       end
       rubber.serial_task self, :serial_reload, :roles => :nginx do
-        sudo "sh -c '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
-      sudo "/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
-      sudo "/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
-      sudo "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

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

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

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

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

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

@@ -2,9 +2,9 @@
   @path = '/etc/apache2/mods-available/passenger.conf'
   @post = 'cd /etc/apache2/mods-enabled && ln -fs ../mods-available/passenger.conf'
 %>
-LoadModule passenger_module <%= rubber_env.passenger_lib %>
-PassengerRoot <%= rubber_env.passenger_root %>
-PassengerRuby <%= rubber_env.passenger_ruby %>
+LoadModule passenger_module <%= `echo #{rubber_env.passenger_lib}` %>
+PassengerRoot <%= `echo #{rubber_env.passenger_root}` %>
+PassengerRuby <%= `echo #{rubber_env.passenger_ruby}` %>
 PassengerUseGlobalQueue on
 
 # max number of rails instances per appserver

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

@@ -1,6 +1,6 @@
 passenger_version: 2.2.11
-passenger_root: "#{ruby_prefix}/lib/ruby/gems/1.8/gems/passenger-#{passenger_version}"
-passenger_ruby: "#{ruby_prefix}/bin/ruby"
+passenger_root: "$GEM_HOME/gems/passenger-#{passenger_version}"
+passenger_ruby: "#{rvm_prefix}/bin/passenger_ruby"
 passenger_lib: "#{passenger_root}/ext/apache2/mod_passenger.so"
 passenger_listen_port: 7000
 passenger_listen_ssl_port: 7001

data/generators/vulcanize/templates/postgresql/config/rubber/common/database.yml

@@ -0,0 +1,12 @@
+<%
+  @path = "#{RUBBER_ROOT}/config/database.yml"
+%>
+
+<%= RUBBER_ENV %>:
+  adapter: postgresql
+  encoding: unicode
+  database: <%= rubber_env.db_name %>
+  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/postgresql/config/rubber/deploy-postgresql.rb

@@ -0,0 +1,131 @@
+
+namespace :rubber do
+  
+  namespace :postgresql do
+    
+    rubber.allow_optional_tasks(self)
+    
+    after "rubber:create", "rubber:postgresql:validate_db_roles"
+
+    task :validate_db_roles do
+      db_instances = rubber_instances.for_role("postgresql_slave")
+      db_instances.each do |instance|
+        if instance.role_names.find {|n| n == 'postgresql_master'}
+          fatal "Cannot have a postgresql slave and master on the same instance, please removing slave role for #{instance.name}"
+        end
+      end
+    end
+
+    after "rubber:bootstrap", "rubber:postgresql:bootstrap"
+  
+    
+    # Bootstrap the production database config.  Db bootstrap is special - the
+    # user could be requiring the rails env inside some of their config
+    # templates, which creates a catch 22 situation with the db, so we try and
+    # bootstrap the db separate from the rest of the config
+    task :bootstrap, :roles => [:postgresql_master, :postgresql_slave] do
+      
+      # Conditionaly bootstrap for each node/role only if that node has not
+      # been boostrapped for that role before
+      master_instances = rubber_instances.for_role("postgresql_master") & rubber_instances.filtered  
+      master_instances.each do |ic|
+        task_name = "_bootstrap_postgresql_master_#{ic.full_name}".to_sym()
+        task task_name, :hosts => ic.full_name do
+          env = rubber_cfg.environment.bind("postgresql_master", ic.name)
+          exists = capture("echo $(ls #{env.postgresql_data_dir}/ 2> /dev/null)")
+          if exists.strip.size == 0
+            common_bootstrap("postgresql_master")
+
+            create_user_cmd = "CREATE USER #{env.db_user} WITH NOSUPERUSER CREATEDB NOCREATEROLE"
+            create_user_cmd << "PASSWORD '#{env.db_pass}'" if env.db_pass
+            rubber.sudo_script "create_master_db", <<-ENDSCRIPT
+              sudo -u postgres psql -c "#{create_user_cmd}"
+              sudo -u postgres psql -c "CREATE DATABASE #{env.db_name} WITH OWNER #{env.db_user}"
+            ENDSCRIPT
+          end
+        end
+        send task_name
+      end
+
+#      Wait for postgresql 9.0 to be avlabel before allowing slaves
+#
+#      slave_instances = rubber_instances.for_role("postgresql_slave") & rubber_instances.filtered
+#      slave_instances.each do |ic|
+#        task_name = "_bootstrap_postgresql_slave_#{ic.full_name}".to_sym()
+#        task task_name, :hosts => ic.full_name do
+#          env = rubber_cfg.environment.bind("postgresql_slave", ic.name)
+#          exists = capture("echo $(ls #{env.db_data_dir}/ 2> /dev/null)")
+#          if exists.strip.size == 0
+#            common_bootstrap("postgresql_slave")
+#
+#            source = master = rubber_instances.for_role("postgresql_master").first
+#
+#            slave_pub_key = capture("cat /root/.ssh/id_dsa.pub")
+#            sudo "echo \"#{slave_pub_key}\" >> /root/.ssh/authorized_keys", :hosts => [master.full_name]
+#
+#            base_backup_script = <<-ENDSCRIPT
+#              sudo -u postgres psql -c "SELECT pg_start_backup('rubber_create_slave')"
+#              tar --exclude pg_xlog -czf /tmp/postgresql-data.tgz #{env.postgresql_data_dir}
+#              tar -czf /tmp/postgresql-archive.tgz #{env.postgresql_archive_dir}
+#              sudo -u postgres psql -c "SELECT pg_stop_backup()"
+#            ENDSCRIPT
+#
+#            rubber.sudo_script "create_slave_db_from_master", base_backup_script, :hosts => [master.full_name]
+#
+#            rsudo "psql -u root -e \"start slave;\""
+#          end
+#        end
+#        send task_name
+#      end
+      
+    end
+  
+    # TODO: Make the setup/update happen just once per host
+    def common_bootstrap(role)
+      # postgresql package install starts postgresql, so stop it
+      rsudo "#{rubber_env.postgresql_ctl} 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
+      rubber.update_code_for_bootstrap
+
+      # Gen just the conf for the given postgresql role
+      rubber.run_config(:RUBBER_ENV => RUBBER_ENV, :FILE => "role/#{role}|role/db/", :FORCE => true, :deploy_path => release_path)
+
+      # reconfigure postgresql so that it sets up data dir in /mnt with correct files
+      dirs = [rubber_env.postgresql_data_dir, rubber_env.postgresql_archive_dir]
+      sudo_script 'reconfigure-postgresql', <<-ENDSCRIPT
+        mkdir -p #{dirs.join(' ')}
+        chown -R postgres:postgres #{dirs.join(' ')}
+
+        sudo -u postgres /usr/lib/postgresql/#{rubber_env.postgresql_ver}/bin/initdb -D #{rubber_env.postgresql_data_dir}
+
+        #{rubber_env.postgresql_ctl} start
+      ENDSCRIPT
+      sleep 5
+    end
+    
+    desc <<-DESC
+      Starts the postgresql daemons
+    DESC
+    task :start, :roles => [:postgresql_master, :postgresql_slave] do
+      rsudo "#{rubber_env.postgresql_ctl} start"
+    end
+    
+    desc <<-DESC
+      Stops the postgresql daemons
+    DESC
+    task :stop, :roles => [:postgresql_master, :postgresql_slave] do
+      rsudo "#{rubber_env.postgresql_ctl} stop"
+    end
+  
+    desc <<-DESC
+      Restarts the postgresql daemons
+    DESC
+    task :restart, :roles => [:postgresql_master, :postgresql_slave] do
+      rsudo "#{rubber_env.postgresql_ctl} restart"
+    end
+
+  end
+
+end

data/generators/vulcanize/templates/postgresql/config/rubber/role/db/crontab

@@ -0,0 +1,14 @@
+<%
+  @read_cmd = 'crontab -l'
+  @write_cmd = 'crontab -'
+  @additive = ["# rubber-postgresql-start", "# rubber-postgresql-end"]
+%>
+
+<%
+  # Backup db every 3 hours to secondary db if available, else primary db
+  backup_db_host = rubber_instances.for_role('db', {}).first rescue nil
+  backup_db_host ||= rubber_instances.for_role('db', 'primary' => true).first
+  if backup_db_host.name == rubber_env.host
+%>
+0 */3 * * * BACKUP_DIR=/mnt/db_backups DBUSER=<%= rubber_env.db_user %> DBPASS=<%= rubber_env.db_pass %> DBNAME=<%= rubber_env.db_name %> DBHOST=<%= backup_db_host.full_name %> <%= RUBBER_ROOT %>/script/cron-rake rubber:backup_db
+<% end %>