standup 0.3.9 → 0.3.10

data/VERSION

@@ -1 +1 @@
-0.3.9
+0.3.10

data/lib/standup/remoting.rb

@@ -92,9 +92,9 @@ module Standup
       exec("if [ -e #{path} ]; then echo 'true'; fi") == "true\n"
     end
       
-    def install_packages *packages
-      packages = [*packages].flatten.join(' ')
-      sudo "apt-get -qqy install #{packages}"
+    def install_packages packages, opts = {}
+      input = opts[:input] ? "echo \"#{opts[:input].join("\n")}\" | sudo " : ''
+      sudo "#{input}apt-get -qqy install #{packages}"
     end
     alias :install_package :install_packages
       
@@ -112,12 +112,12 @@ module Standup
       raise ArgumentError, ":section option is required" unless opts[:section]
       user = opts[:user] || @node.scripts.ec2.params.ssh_user
       commands = commands.strip.split("\n") if commands.is_a? String
-      commands = commands.map(&:strip).join(' && ')
+      commands = commands.map(&:strip).join(' && ').gsub(/%/, '\%')
     
       in_temp_dir do |dir|
         sudo "crontab -l -u #{user} > crontab.txt"
         remote_update "#{dir}/crontab.txt",
-                      "#{schedule} #{commands} > /var/log/cron.log 2>&1\n",
+                      "#{schedule} (date && #{commands}) >> /var/log/cron.log 2>&1\n",
                       :delimiter => "# standup update_cron: #{opts[:section]}",
                       :sudo => true
         sudo "crontab -u #{user} - < crontab.txt"

data/scripts/basics.rb

@@ -7,5 +7,8 @@ Standup.script :node do
       upload file,
              :to => "/home/#{scripts.ec2.params.ssh_user}/.s3cfg"
     end
+    
+    sudo 'touch /var/log/cron.log'
+    sudo 'chmod 666 /var/log/cron.log'
   end
 end

data/scripts/db_backup.rb

@@ -1,14 +1,10 @@
 Standup.script :node do
-  self.description = 'Rails application database periodic backup to S3'
-  
   def run
     exec "s3cmd mb #{bucket}"
     
     update_cron '@hourly', <<-CMD, :section => name
-      touch dump.gz
-      sudo chmod 666 dump.gz
-      sudo su -c "pg_dump -c #{scripts.webapp.db_name} | gzip > dump.gz" postgres
-      s3cmd put dump.gz #{path_prefix}/`date -u +%Y-%M-%d/%H_%m_%S`.gz
+      #{scripts.webapp.db.dump_command scripts.webapp.db_name, 'webapp', 'webapp'} | gzip > dump.gz
+      s3cmd put dump.gz #{path_prefix}/`date -u +%Y-%m-%d/%H-%M-%S`.gz
       rm dump.gz
     CMD
   end

data/scripts/download_db.rb

@@ -3,29 +3,40 @@ Standup.script :node do
   
   def run
     in_temp_dir do |dir|
-      su_exec 'postgres', "pg_dump -c #{scripts.webapp.db_name} > dump.sql"
+      exec "#{scripts.webapp.db.dump_command scripts.webapp.db_name} > dump.sql"
       local_exec "mkdir -p tmp/db"
       download "#{dir}/dump.sql",
                :to => 'tmp/db/dump.sql',
                :sudo => true
     end
     
-    bootstrap_db
+    create_user 'webapp', 'webapp'
+    create_database scripts.webapp.db_name, 'webapp'
     
-    local_exec "psql #{scripts.webapp.db_name} < tmp/db/dump.sql"
+    local_exec "#{scripts.webapp.db.load_command scripts.webapp.db_name} < tmp/db/dump.sql"
   end
   
-  def bootstrap_db
-    unless exec_sql("select * from pg_user where usename = 'webapp'") =~ /1 row/
-      exec_sql "create user webapp with password 'webapp'"
+  def create_user name, password
+    if exec_sql("select user from mysql.user where user = '#{name}'").present?
+      false
+    else
+      exec_sql "create user '#{name}'@'localhost' identified by '#{password}'"
+      true
     end
-    
-    unless exec_sql("select * from pg_database where datname = '#{scripts.webapp.db_name}'") =~ /1 row/
-      exec_sql "create database #{scripts.webapp.db_name} with owner webapp"
+  end
+  
+  def create_database name, owner
+    if exec_sql("show databases like '#{name}'").present?
+      false
+    else
+      exec_sql "create database #{name}"
+      exec_sql "grant all on #{name}.* to '#{owner}'@'localhost'"
+      true
     end
   end
   
-  def exec_sql sql, db_name = 'postgres'
-    local_exec "psql #{db_name} -c \"#{sql}\""
+  
+  def exec_sql sql, db_name = 'mysql'
+    local_exec "mysql -uroot -proot #{db_name} -e \"#{sql}\""
   end
 end

data/scripts/mysql.rb

@@ -0,0 +1,40 @@
+Standup.script :node do
+  def run
+    install_package 'mysql-server-5.1', :input => ['root', 'root', 'root']
+    install_package 'libmysqlclient-dev'
+    
+    # todo: tune performance
+  end
+  
+  def exec_sql sql
+    exec "mysql -uroot -proot -e \"#{sql}\""
+  end
+  
+  def create_user name, password
+    if exec_sql("select user from mysql.user where user = '#{name}'").present?
+      false
+    else
+      exec_sql "create user '#{name}'@'localhost' identified by '#{password}'"
+      true
+    end
+  end
+  
+  def create_database name, owner
+    if exec_sql("show databases like '#{name}'").present?
+      false
+    else
+      exec_sql "create database #{name}"
+      exec_sql "grant all on #{name}.* to '#{owner}'@'localhost'"
+      true
+    end
+  end
+  
+  def dump_command database, username = 'root', password = 'root'
+    "mysqldump -u#{username} -p#{password} --compact -e --create-options --add-drop-table #{database}"
+  end
+  
+  def load_command database, username = 'root', password = 'root'
+    username = 'root' if username == :local
+    "mysql -u#{username} -p#{password} #{database}"
+  end
+end

data/scripts/passenger/nginx.conf

@@ -1,4 +1,4 @@
-#user  nobody;
+user  www-data;
 worker_processes  1;
 
 pid /var/run/nginx.pid;

data/scripts/postgresql.rb

@@ -1,6 +1,6 @@
 Standup.script :node do
   def run
-    install_package 'postgresql-8.4 libpq-dev'
+    install_packages 'postgresql-8.4 libpq-dev'
   
     upload script_file('postgresql.conf'),
            :to => '/etc/postgresql/8.4/main/postgresql.conf',
@@ -11,8 +11,38 @@ Standup.script :node do
     sudo 'service postgresql-8.4 restart'
   end
   
-  def exec_sql command
-    su_exec 'postgres', "psql -c \"#{command}\""
+  def exec_sql sql
+    su_exec 'postgres', "psql -c \"#{sql}\""
+  end
+  
+  def create_user name, password
+    if exec_sql("select * from pg_user where usename = '#{name}'") =~ /1 row/
+      false
+    else
+      exec_sql "create user #{name} with password '#{password}'"
+      true
+    end
+  end
+  
+  def create_database name, owner
+    if exec_sql("select * from pg_database where datname = '#{name}'") =~ /1 row/
+      false
+    else
+      exec_sql "create database #{name} with owner #{owner}"
+      true
+    end
+  end
+  
+  def dump_command database, username = 'postgres', *args
+    "sudo su -c \"pg_dump -c #{database}\" #{username}"
+  end
+  
+  def load_command database, username = 'postgres', *args
+    if username == :local
+      "psql #{database}"
+    else
+      "sudo su -c \"psql #{database}\" #{username}"
+    end
   end
   
   protected

data/scripts/update.rb

@@ -8,9 +8,9 @@ Standup.script :node do
       sudo 'bundle install'
       sudo "RAILS_ENV=#{scripts.webapp.params.rails_env} rake db:migrate"
       sudo 'mkdir -p tmp'
-      sudo 'chown -R nobody:nogroup .'
+      sudo 'chown -R www-data:www-data .'
       sudo 'touch tmp/restart.txt'
       scripts.delayed_job.restart if scripts.setup.has_script? 'delayed_job'
     end
   end
-end
+end

data/scripts/upload_db.rb

@@ -3,14 +3,14 @@ Standup.script :node do
   
   def run
     local_exec "mkdir -p tmp/db"
-    local_exec "pg_dump -c #{scripts.webapp.db_name} > tmp/db/dump.sql"
+    local_exec "#{scripts.webapp.db.dump_command scripts.webapp.db_name, 'webapp', 'webapp'} > tmp/db/dump.sql"
     
     in_temp_dir do |dir|
       upload 'tmp/db/dump.sql',
              :to => "#{dir}/dump.sql"
       exec "chmod 777 #{dir}/dump.sql"
       
-      su_exec 'postgres', "psql #{scripts.webapp.db_name} < #{dir}/dump.sql"
+      exec "#{scripts.webapp.db.load_command scripts.webapp.db_name, 'webapp', 'webapp'} < #{dir}/dump.sql"
     end
   end
 end

data/scripts/webapp.rb

@@ -23,7 +23,7 @@ Standup.script :node do
 
     bootstrap_db
 
-    sudo "chown -R nobody:nogroup #{scripts.webapp.app_path}"
+    sudo "chown -R www-data:www-data #{scripts.webapp.app_path}"
     
     with_processed_file script_file('webapp.conf') do |file|
       scripts.passenger.add_server_conf file, "#{params.name}.conf"
@@ -38,6 +38,12 @@ Standup.script :node do
     "#{params.name}_#{params.rails_env}"
   end
   
+  def db
+    return scripts.postgresql if scripts.setup.has_script? 'postgresql'
+    return scripts.mysql if scripts.setup.has_script? 'mysql'
+    nil
+  end
+  
   protected
   
   def ensure_github_access
@@ -57,13 +63,8 @@ Standup.script :node do
   end
   
   def bootstrap_db
-    unless scripts.postgresql.exec_sql("select * from pg_user where usename = 'webapp'") =~ /1 row/
-      scripts.postgresql.exec_sql "create user webapp with password 'webapp'"
-    end
-    
-    unless scripts.postgresql.exec_sql("select * from pg_database where datname = '#{db_name}'") =~ /1 row/
-      scripts.postgresql.exec_sql "create database #{db_name} with owner webapp"
-      
+    db.create_user 'webapp', 'webapp'
+    if db.create_database db_name, 'webapp'
       in_dir scripts.webapp.app_path do
         sudo 'bundle install'
         exec "RAILS_ENV=#{params.rails_env} rake db:schema:load"

data/standup.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{standup}
-  s.version = "0.3.9"
+  s.version = "0.3.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilia Ablamonov", "Cloud Castle Inc."]
-  s.date = %q{2010-11-16}
+  s.date = %q{2010-12-06}
   s.default_executable = %q{standup}
   s.email = %q{ilia@flamefork.ru}
   s.executables = ["standup"]
@@ -56,6 +56,7 @@ Gem::Specification.new do |s|
      "scripts/monit/monit",
      "scripts/monit/monitrc",
      "scripts/monit/sshd.conf",
+     "scripts/mysql.rb",
      "scripts/passenger.rb",
      "scripts/passenger/nginx",
      "scripts/passenger/nginx.conf",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: standup
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 3
-  - 9
-  version: 0.3.9
+  - 10
+  version: 0.3.10
 platform: ruby
 authors: 
 - Ilia Ablamonov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 +03:00
+date: 2010-12-06 00:00:00 +03:00
 default_executable: standup
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -173,6 +173,7 @@ files:
 - scripts/monit/monit
 - scripts/monit/monitrc
 - scripts/monit/sshd.conf
+- scripts/mysql.rb
 - scripts/passenger.rb
 - scripts/passenger/nginx
 - scripts/passenger/nginx.conf