yet more cleanup

shared/additional-modules/god/templates/god-init.d

@@ -32,7 +32,7 @@ stop() {
     fi
   done
 
-  killall -9 <%= bin %> || true
+  pkill -9 -f <%= bin %> || true
   echo "$NAME."
 }
 

shared/additional-modules/varnish/manifests/init.pp

@@ -85,7 +85,7 @@ class varnish($version, $vcl, $user = 'varnish', $group = 'varnish', $store_file
   }
 
   init_d { $name:
-    require => Build_and_install[$name]
+    require => Mkdir_p[$dirs]
   }
 }
 

shared/lib/puppet/provider/god_init/install.rb

@@ -57,7 +57,7 @@ God.watch do |w|
   w.interval = <%= interval %>.seconds
 
   w.start = lambda { system("<%= start %>") }
-  w.start_grace = <% interval  %>.seconds
+  w.start_grace = <%= interval %>.seconds
 
   <% if  !stop.empty? %>
     w.stop = lambda { system("<%= stop %>") ; system("killall -9 <%= name %>") }