github-migration
/
puppet-standalone-mashup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

yet more cleanup

This commit is contained in:
John Bintz 2012-06-04 16:30:49 -04:00
parent dc5e8549b5
commit 1fc6f377fd
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shared/additional-modules/god/templates/god-init.d
View File

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

2
shared/additional-modules/varnish/manifests/init.pp
View File

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

2
shared/lib/puppet/provider/god_init/install.rb
View File

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