From 104ed53b164014603e4fe56c211c3048f2f51cd0 Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Wed, 16 May 2012 06:43:53 -0400
Subject: [PATCH] fixes

---
 lib/puppet-standalone-mashup/capistrano.rb       |  2 +-
 .../varnish/manifests/debian.pp                  |  2 +-
 shared/modules/ssh/manifests/init.pp             | 16 ++++++++++++----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/puppet-standalone-mashup/capistrano.rb b/lib/puppet-standalone-mashup/capistrano.rb
index df72f7c..d0248cb 100644
--- a/lib/puppet-standalone-mashup/capistrano.rb
+++ b/lib/puppet-standalone-mashup/capistrano.rb
@@ -18,7 +18,7 @@ module Capistrano
 
     def replace_placeholders(command, channel)
       command = _replace_placeholders(command, channel)
-      command.gsub!('$CAPISTRANO:TARGETHOSTNAME$', channel[:server].options[:target_hostname])
+      command.gsub!('$CAPISTRANO:TARGETHOSTNAME$', channel[:server].options[:target_hostname] || '')
       command
     end
   end
diff --git a/shared/additional-modules/varnish/manifests/debian.pp b/shared/additional-modules/varnish/manifests/debian.pp
index 680b73e..d2f9b85 100644
--- a/shared/additional-modules/varnish/manifests/debian.pp
+++ b/shared/additional-modules/varnish/manifests/debian.pp
@@ -14,7 +14,7 @@ class varnish::debian($version, $vcl_template, $store_file_mb = 1024) {
     vcl_template => $vcl_template
   }
 
-  init_d_bundle { 'varnish':
+  init_d { 'varnish':
     init_d_prolog => template('varnish/debian/init-d-prolog'),
     init_d_prerun => template('varnish/debian/init-d-prerun'),
     require => Class['varnish']
diff --git a/shared/modules/ssh/manifests/init.pp b/shared/modules/ssh/manifests/init.pp
index 6a61cac..a717873 100644
--- a/shared/modules/ssh/manifests/init.pp
+++ b/shared/modules/ssh/manifests/init.pp
@@ -3,25 +3,33 @@ define ssh {
 
   file { $ssh_dir:
     ensure => directory,
-    mode => '2700'
+    mode => '0700',
+    owner => $name,
+    group => $name
   }
 
   file { "${ssh_dir}/authorized_keys":
     content => template("ssh/${name}/authorized_keys"),
     require => File[$ssh_dir],
-    mode => '0644'
+    mode => '0644',
+    owner => $name,
+    group => $name
   }
 
   file { "${ssh_dir}/id_dsa":
     content => template("ssh/${name}/id_dsa"),
     require => File[$ssh_dir],
-    mode => '0600'
+    mode => '0600',
+    owner => $name,
+    group => $name
   }
 
   file { "${ssh_dir}/id_dsa.pub":
     content => template("ssh/${name}/id_dsa.pub"),
     require => File[$ssh_dir],
-    mode => '0644'
+    mode => '0644',
+    owner => $name,
+    group => $name
   }
 }