Simplify upstart definitions

* Remove unecessary script stanzas
* Remove explicit interpreter
* Run salt-master in the foreground
This commit is contained in:
Ulrich Dangel 2012-08-07 06:39:06 +02:00
parent 218a0bd35d
commit f7de4b74f4
3 changed files with 3 additions and 8 deletions

View file

@ -5,8 +5,7 @@ start on (net-device-up
and runlevel [2345])
stop on runlevel [!2345]
expect daemon
respawn limit 10 5
respawn
exec /usr/bin/salt-master -d
exec /usr/bin/salt-master >/dev/null 2>&1

View file

@ -8,6 +8,4 @@ stop on runlevel [!2345]
respawn limit 10 5
respawn
script
exec /usr/bin/python /usr/bin/salt-minion > /dev/null 2>&1
end script
exec /usr/bin/salt-minion >/dev/null 2>&1

View file

@ -8,6 +8,4 @@ stop on runlevel [!2345]
respawn limit 10 5
respawn
script
exec /usr/bin/python /usr/bin/salt-syndic > /dev/null 2>&1
end script
exec /usr/bin/salt-syndic >/dev/null 2>&1