moving ssh key relatedstuff around in sprinkle scrip
This commit is contained in:
parent
49544135a1
commit
86c43ecbd8
2 changed files with 13 additions and 13 deletions
|
|
@ -1,12 +1,8 @@
|
|||
package :git, :provides => :scm do
|
||||
description 'Git Distributed Version Control'
|
||||
apt %w( git-core ) do
|
||||
pre :install, "rm -rf /root/.ssh/"
|
||||
pre :install, "mkdir -p /root/.ssh/"
|
||||
end
|
||||
apt %w( git-core )
|
||||
requires :pubkey
|
||||
requires :privkey
|
||||
requires :known_hosts
|
||||
|
||||
end
|
||||
|
||||
package :privkey do
|
||||
|
|
@ -15,7 +11,11 @@ package :privkey do
|
|||
end
|
||||
|
||||
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
|
||||
|
||||
package :known_hosts do
|
||||
|
|
|
|||
|
|
@ -35,12 +35,12 @@ require "#{File.dirname(__FILE__)}/packages/ruby"
|
|||
|
||||
policy :diaspora, :roles => [:tom, :backer] do
|
||||
# requires :clean_dreamhost
|
||||
requires :tools
|
||||
requires :rubygems
|
||||
requires :bundler
|
||||
requires :diaspora_dependencies
|
||||
requires :database
|
||||
requires :webserver
|
||||
# requires :tools
|
||||
#requires :rubygems
|
||||
#requires :bundler
|
||||
#requires :diaspora_dependencies
|
||||
#requires :database
|
||||
#requires :webserver
|
||||
requires :scm
|
||||
requires :vim
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue