From 5ef3806a329036abd87d81a816fbdb0c1ceb799b Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Tue, 26 Jun 2012 05:54:13 -0400
Subject: [PATCH] better stuff

---
 lib/puppet-standalone-mashup/capistrano.rb | 3 ++-
 skel/debian/bootstrap.erb                  | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/puppet-standalone-mashup/capistrano.rb b/lib/puppet-standalone-mashup/capistrano.rb
index 6f29551..37a9fba 100644
--- a/lib/puppet-standalone-mashup/capistrano.rb
+++ b/lib/puppet-standalone-mashup/capistrano.rb
@@ -77,6 +77,7 @@ Capistrano::Configuration.instance.load do
     top.rename if rename_server
 
     run "cd #{puppet_dir} && #{sudo} ./bootstrap"
+    run "#{sudo} shutdown -r now"
   end
 
   desc "Rename the server"
@@ -92,7 +93,7 @@ Capistrano::Configuration.instance.load do
     top.ensure_puppet_dir
 
     Dir["*"].each do |file|
-      if !%w{vbox}.include?(file)
+      if !%w{vbox deb}.include?(file)
         top.upload file, File.join(puppet_dir, file)
       end
     end
diff --git a/skel/debian/bootstrap.erb b/skel/debian/bootstrap.erb
index 297725c..82c3408 100644
--- a/skel/debian/bootstrap.erb
+++ b/skel/debian/bootstrap.erb
@@ -23,5 +23,3 @@ gem install puppet --no-ri --no-rdoc
 
 ./apply
 
-shutdown -r now
-