standup 0.3.10 → 0.3.11

data/VERSION

@@ -1 +1 @@
-0.3.10
+0.3.11

data/lib/standup/core_ext.rb

@@ -10,6 +10,6 @@ module Kernel
   
   def local_exec command
     bright_p command
-    `#{command}`
+    `#{command} 2>&1`.tap{|result| puts result}
   end
 end

data/lib/standup/remoting.rb

@@ -77,7 +77,7 @@ module Standup
     end
       
     def su_exec user, command
-      sudo "su -c \"#{command.gsub /"/, '\"'}\" #{user}"
+      sudo "-u #{user} \"#{command.gsub /"/, '\"'}\""
     end
       
     def in_temp_dir &block
@@ -102,10 +102,13 @@ module Standup
       if version
         unless exec("gem list | grep #{name}").try(:[], version)
           sudo "gem install #{name} -v #{version} --no-ri --no-rdoc"
+          return true
         end
       else
         sudo "gem install #{name} --no-ri --no-rdoc"
+        return true
       end
+      false
     end
     
     def update_cron schedule, commands, opts = {}

data/scripts/db_backup.rb

@@ -3,7 +3,7 @@ Standup.script :node do
     exec "s3cmd mb #{bucket}"
     
     update_cron '@hourly', <<-CMD, :section => name
-      #{scripts.webapp.db.dump_command scripts.webapp.db_name, 'webapp', 'webapp'} | gzip > dump.gz
+      #{scripts.webapp.db.dump_command scripts.webapp.db_name} | gzip > dump.gz
       s3cmd put dump.gz #{path_prefix}/`date -u +%Y-%m-%d/%H-%M-%S`.gz
       rm dump.gz
     CMD

data/scripts/download_db.rb

@@ -10,33 +10,8 @@ Standup.script :node do
                :sudo => true
     end
     
-    create_user 'webapp', 'webapp'
-    create_database scripts.webapp.db_name, 'webapp'
+    scripts.webapp.db.create_database scripts.webapp.db_name, true
     
     local_exec "#{scripts.webapp.db.load_command scripts.webapp.db_name} < tmp/db/dump.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 exec_sql sql, db_name = 'mysql'
-    local_exec "mysql -uroot -proot #{db_name} -e \"#{sql}\""
-  end
 end

data/scripts/ec2.rb

@@ -39,6 +39,8 @@ Standup.script :node do
                                          [Standup::EC2::SecurityGroup.list[node.id_group]]
     puts "waiting until it's up"
     inst.wait_until {inst.state != :running}
+    puts "and a bit more to let it really up"
+    sleep 20
   end
   
   def configure_elastic_ip

data/scripts/mysql.rb

@@ -6,25 +6,20 @@ Standup.script :node do
     # 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
+  def exec_sql sql, local = false
+    command = "mysql -uroot -proot -e \"#{sql}\""
+    if local
+      local_exec command
     else
-      exec_sql "create user '#{name}'@'localhost' identified by '#{password}'"
-      true
+      exec command
     end
   end
   
-  def create_database name, owner
-    if exec_sql("show databases like '#{name}'").present?
+  def create_database name, local = false
+    if exec_sql("show databases like '#{name}'", local).present?
       false
     else
-      exec_sql "create database #{name}"
-      exec_sql "grant all on #{name}.* to '#{owner}'@'localhost'"
+      exec_sql "create database #{name}", local
       true
     end
   end

data/scripts/passenger/nginx.conf

@@ -1,5 +1,5 @@
 user  www-data;
-worker_processes  1;
+worker_processes  2;
 
 pid /var/run/nginx.pid;
 
@@ -8,7 +8,7 @@ events {
 }
 
 http {
-    passenger_root /usr/local/lib/ruby/gems/1.8/gems/passenger-3.0.0;
+    passenger_root /usr/local/lib/ruby/gems/1.8/gems/passenger-3.0.1;
     passenger_ruby /usr/local/bin/ruby;
 
     include       mime.types;

data/scripts/passenger.rb

@@ -2,9 +2,7 @@ Standup.script :node do
   def run
     scripts.ec2.open_port 80
     
-    install_gem 'passenger', '3.0.0'
-    
-    unless file_exists? '/opt/nginx/sbin/nginx'
+    if install_gem('passenger', '3.0.1') || !file_exists?('/opt/nginx/sbin/nginx')
       install_package 'libcurl4-openssl-dev'
       sudo 'passenger-install-nginx-module --auto --auto-download --prefix=/opt/nginx'
     end

data/scripts/postgresql/pg_hba.conf

@@ -0,0 +1,3 @@
+local all all              trust
+host  all all 127.0.0.1/32 trust
+host  all all ::1/128      trust

data/scripts/postgresql.rb

@@ -2,6 +2,10 @@ Standup.script :node do
   def run
     install_packages 'postgresql-8.4 libpq-dev'
   
+    upload script_file('pg_hba.conf'),
+           :to => '/etc/postgresql/8.4/main/pg_hba.conf',
+           :sudo => true
+  
     upload script_file('postgresql.conf'),
            :to => '/etc/postgresql/8.4/main/postgresql.conf',
            :sudo => true
@@ -11,38 +15,30 @@ Standup.script :node do
     sudo 'service postgresql-8.4 restart'
   end
   
-  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
+  def exec_sql sql, local = false
+    command = "psql -c \"#{sql}\" -U postgres -w"
+    if local
+      local_exec command
     else
-      exec_sql "create user #{name} with password '#{password}'"
-      true
+      exec command
     end
   end
   
-  def create_database name, owner
-    if exec_sql("select * from pg_database where datname = '#{name}'") =~ /1 row/
+  def create_database name, local = false
+    if exec_sql("select * from pg_database where datname = '#{name}'", local) =~ /1 row/
       false
     else
-      exec_sql "create database #{name} with owner #{owner}"
+      exec_sql "create database #{name}", local
       true
     end
   end
   
   def dump_command database, username = 'postgres', *args
-    "sudo su -c \"pg_dump -c #{database}\" #{username}"
+    "pg_dump -c #{database} -U #{username} -w"
   end
   
   def load_command database, username = 'postgres', *args
-    if username == :local
-      "psql #{database}"
-    else
-      "sudo su -c \"psql #{database}\" #{username}"
-    end
+    "psql #{database} -U #{username} -w"
   end
   
   protected

data/scripts/upload_db.rb

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

data/scripts/webapp.rb

@@ -63,8 +63,7 @@ Standup.script :node do
   end
   
   def bootstrap_db
-    db.create_user 'webapp', 'webapp'
-    if db.create_database db_name, 'webapp'
+    if db.create_database db_name
       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.10"
+  s.version = "0.3.11"
 
   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-12-06}
+  s.date = %q{2010-12-07}
   s.default_executable = %q{standup}
   s.email = %q{ilia@flamefork.ru}
   s.executables = ["standup"]
@@ -62,6 +62,7 @@ Gem::Specification.new do |s|
      "scripts/passenger/nginx.conf",
      "scripts/passenger/nginx_monit.conf",
      "scripts/postgresql.rb",
+     "scripts/postgresql/pg_hba.conf",
      "scripts/postgresql/postgresql.conf",
      "scripts/ruby.rb",
      "scripts/setup.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: standup
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 3
-  - 10
-  version: 0.3.10
+  - 11
+  version: 0.3.11
 platform: ruby
 authors: 
 - Ilia Ablamonov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 +03:00
+date: 2010-12-07 00:00:00 +03:00
 default_executable: standup
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -179,6 +179,7 @@ files:
 - scripts/passenger/nginx.conf
 - scripts/passenger/nginx_monit.conf
 - scripts/postgresql.rb
+- scripts/postgresql/pg_hba.conf
 - scripts/postgresql/postgresql.conf
 - scripts/ruby.rb
 - scripts/setup.rb