@@ -10,7 +10,24 @@ Capistrano::Configuration.instance.load do set :git_enable_submodules, 1 #allow deploys w/o having git installed locally - set(:real_revision) { capture("git ls-remote #{repository} #{branch} | cut -f 1") } + set(:real_revision) do + output = "" + invoke_command("git ls-remote #{repository} #{branch} | cut -f 1", :once => true) do |ch, stream, data| + case stream + when :out + if data =~ /\(yes\/no\)\?/ # first time connecting via ssh, add to known_hosts? + ch.send_data "yes\n" + elsif data =~ /Warning/ + elsif data =~ /yes/ + # + else + output << data + end + when :err then warn "[err :: #{ch[:server]}] #{data}" + end + end + output.gsub(/\\/, '').chomp + end #no need for system, log, and pids directory set :shared_children, %w() @@ -20,6 +37,7 @@ Capistrano::Configuration.instance.load do before "deploy:setup", "puppet:initial_setup" before "deploy:setup", "setup:users" + after "deploy:setup", "setup:fix_permissions" namespace :deploy do desc "Override deploy restart to not do anything" @@ -61,6 +79,7 @@ Capistrano::Configuration.instance.load do task :generate_ssh_keys do run "mkdir -p /home/wordpress/.ssh" + run "chmod 700 /home/wordpress/.ssh" run "ssh-keygen -q -f /home/wordpress/.ssh/id_rsa -N ''" pubkey = capture("cat /home/wordpress/.ssh/id_rsa.pub") puts "Below is a freshly generated SSH public key for your server." @@ -86,6 +105,10 @@ Capistrano::Configuration.instance.load do puts "Not resetting password, none provided" end end + + task :fix_permissions do + sudo "chown -R #{user}:wheel #{deploy_to}" + end end namespace :apache do config/deploy/wordpress.rb 045539400448bd5c4bc5c6b33bec05359a0ee3e9 Jesse Newland jnewland@gmail.com http://github.com/jestro/wordpress-capistrano/commit/827c9366c6133c338f417e17ac5cf21d5d3a79a5 827c9366c6133c338f417e17ac5cf21d5d3a79a5 2008-11-24T11:55:16-08:00 2008-11-24T11:55:16-08:00 fix windows hack, permissions fix 4e4b09b9fd30541b06c15f5238224a561aa552e6 Jesse Newland jnewland@gmail.com