moving ssh key relatedstuff around in sprinkle scrip

This commit is contained in:
ilya 2010-08-08 19:48:42 -07:00
parent 49544135a1
commit 86c43ecbd8
2 changed files with 13 additions and 13 deletions

View file

@ -1,12 +1,8 @@
package :git, :provides => :scm do package :git, :provides => :scm do
description 'Git Distributed Version Control' description 'Git Distributed Version Control'
apt %w( git-core ) do apt %w( git-core )
pre :install, "rm -rf /root/.ssh/"
pre :install, "mkdir -p /root/.ssh/"
end
requires :pubkey requires :pubkey
requires :privkey
requires :known_hosts
end end
package :privkey do package :privkey do
@ -15,7 +11,11 @@ package :privkey do
end end
package :pubkey do package :pubkey do
transfer "#{File.dirname(__FILE__)}/../deploy_key/id_rsa.pub", '/root/.ssh/id_rsa.pub', :render => false transfer "#{File.dirname(__FILE__)}/../deploy_key/id_rsa.pub", '/root/.ssh/id_rsa.pub', :render => false do
pre :install, "mkdir -p /root/.ssh/"
requires :privkey
requires :known_hosts
end
end end
package :known_hosts do package :known_hosts do

View file

@ -35,12 +35,12 @@ require "#{File.dirname(__FILE__)}/packages/ruby"
policy :diaspora, :roles => [:tom, :backer] do policy :diaspora, :roles => [:tom, :backer] do
# requires :clean_dreamhost # requires :clean_dreamhost
requires :tools # requires :tools
requires :rubygems #requires :rubygems
requires :bundler #requires :bundler
requires :diaspora_dependencies #requires :diaspora_dependencies
requires :database #requires :database
requires :webserver #requires :webserver
requires :scm requires :scm
requires :vim requires :vim
end end