diff --git a/config/sprinkle/packages/scm.rb b/config/sprinkle/packages/scm.rb index b995b3253..7ed5a242a 100644 --- a/config/sprinkle/packages/scm.rb +++ b/config/sprinkle/packages/scm.rb @@ -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 diff --git a/config/sprinkle/provision.rb b/config/sprinkle/provision.rb index 63302b874..c0ed8636b 100644 --- a/config/sprinkle/provision.rb +++ b/config/sprinkle/provision.rb @@ -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