saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make /etc/salt-master usefull

Browse source 
Add environment variable to have a custom CONFIG_DIR
This commit is contained in:
Xavier Henner 2014-12-11 14:58:47 +01:00
parent 006a3179d3
commit 59ebeca5e1
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debian/salt-master.upstart vendored
View file

@ -6,6 +6,8 @@ start on (net-device-up
stop on runlevel [!2345]
limit nofile 100000 100000
env CONFIG_DIR=/etc/salt
script
# Read configuration variable file if it is present
[ -f /etc/default/$UPSTART_JOB ] && . /etc/default/$UPSTART_JOB
@ -13,5 +15,5 @@ script
# Activate the virtualenv if defined
[ -f $SALT_USE_VIRTUALENV/bin/activate ] && . $SALT_USE_VIRTUALENV/bin/activate
exec salt-master
exec salt-master -c $CONFIG_DIR
end script