From e7c3681d1e9ad9cc4b33f8b3a0d7173f6a2d695d Mon Sep 17 00:00:00 2001
From: John Bintz <john@coswellproductions.com>
Date: Tue, 12 Jun 2012 17:00:41 -0400
Subject: [PATCH] tweak some small things

---
 shared/additional-modules/debian-base/manifests/init.pp       | 4 ++--
 .../additional-modules/varnish/templates/debian/init_d_prerun | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/shared/additional-modules/debian-base/manifests/init.pp b/shared/additional-modules/debian-base/manifests/init.pp
index 1dcfb92..19e7a69 100644
--- a/shared/additional-modules/debian-base/manifests/init.pp
+++ b/shared/additional-modules/debian-base/manifests/init.pp
@@ -23,8 +23,8 @@ class base {
 }
 
 define init_d {
-  $init_d_prerun = template("${name}/${osfamily}/init_d_prerun")
-  $init_d_prolog = template("${name}/${osfamily}/init_d_prolog")
+  $init_d_prerun = template("${name}/${::osfamily}/init_d_prerun")
+  $init_d_prolog = template("${name}/${::osfamily}/init_d_prolog")
 
   file { "/etc/init.d/${name}":
     content => template("${name}/${name}-init.d"),
diff --git a/shared/additional-modules/varnish/templates/debian/init_d_prerun b/shared/additional-modules/varnish/templates/debian/init_d_prerun
index 611dccd..e600bd7 100644
--- a/shared/additional-modules/varnish/templates/debian/init_d_prerun
+++ b/shared/additional-modules/varnish/templates/debian/init_d_prerun
@@ -4,5 +4,3 @@ ulimit -n ${NFILES:-131072}
 # Maxiumum locked memory size for shared memory log
 ulimit -l ${MEMLOCK:-82000}
 
-USER=<%= varnish_user %>
-GROUP=<%= varnish_group %>