Merge pull request #680 from peckpeck/bug_5913/adapt_killall_to_kill_…

…pidof_combination_in_source_rudder_web_properties Fixes #5913: Adapt killall to kill/pidof combination in source rudder-web.properties
Normation · Dec 4, 2014 · 0a805aa · 0a805aa
2 parents d8bc916 + f821c86
commit 0a805aa
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/rudder-web/src/main/resources/configuration.properties.sample b/rudder-web/src/main/resources/configuration.properties.sample
@@ -202,7 +202,7 @@ rudder.nova.checkpromises.command=/bin/true
 # Command to force the server to reload its promises
 # This will be run every time promises are regenerated on the root server
 #
-rudder.cfengine.reload.server.command=/usr/bin/killall -SIGHUP cf-serverd
+rudder.cfengine.reload.server.command=/usr/bin/killall -SIGHUP cf-serverd || /bin/kill -SIGHUP `/bin/pidof cf-serverd 2>/dev/null`
 
 #
 # Path to where CFEngine Enterprise (ex Nova) licenses are stored.