John Kristensen
43663fec1b
Have salt-api service watch the master config files
...
The salt-api service is configured using the master config files but is
not restarted when the master is restarted. We need the salt-api service
to watch the master config files to ensure that any config changes are
picked up.
2016-12-08 12:19:53 +11:00
Nitin Madhok
5db269e560
Merge pull request #166 from irtnog/enable-salt-api-service
...
Configure the salt-api service to start at boot time
2015-08-09 07:58:04 -04:00
Simon Lloyd
02f7b279a1
Only watch salt-api package if install_packages=true
...
Also watch salt-api pkg instead of salt-master one.
2015-08-08 17:58:45 +02:00
Matthew X. Economou
c014015e79
Configure the salt-api service to start at boot time
2015-08-02 21:17:36 -04:00
Brian Jackson
4c1f57792a
Revert "Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip."
...
This reverts commit 7bb82b0178
2015-07-20 17:05:57 -05:00
Brian Jackson
6e98d508c4
Revert "Fix salt/api.sls."
...
This reverts commit 8a1b8dc9db
2015-07-20 17:05:57 -05:00
Brian Jackson
d216a3f651
Revert "Install cherrypy/tornado from pip only if use_pip is True."
...
This reverts commit 90282eff03
2015-07-20 17:05:56 -05:00
Brian Jackson
8448aa4021
Revert "Fix stuff suggested by @iggy."
...
This reverts commit c5ae289fa1
2015-07-20 17:05:56 -05:00
Brian Jackson
f9cb912a65
Revert "salt.api state fails"
...
This reverts commit 22b8dde1ff
2015-07-20 17:05:56 -05:00
Marco Orovecchia
22b8dde1ff
salt.api state fails
...
Seems there are several colons missing for salt.api to work correctly, hope I found all of them
2015-07-14 14:21:14 +02:00
René Jochum
c5ae289fa1
Fix stuff suggested by @iggy.
...
Signed-off-by: René Jochum <rene@jochums.at>
2015-07-13 22:31:32 +02:00
René Jochum
90282eff03
Install cherrypy/tornado from pip only if use_pip is True.
...
Signed-off-by: René Jochum <rene@jochums.at>
2015-07-13 22:08:20 +02:00
René Jochum
8a1b8dc9db
Fix salt/api.sls.
...
Signed-off-by: René Jochum <rene@jochums.at>
2015-07-13 13:46:17 +02:00
René Jochum
7bb82b0178
Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip.
...
Signed-off-by: René Jochum <rene@jochums.at>
2015-07-13 13:37:10 +02:00
Niels Abspoel
9ae8a4d746
Fix recursion in api.service
2015-03-28 22:29:01 +01:00
Brian Jackson
924c04c0d8
Add setting to not install packages
...
If you are installing Salt via git/pip, the formula will try to overwrite your
install with packaged versions. This setting makes it possible to avoid that.
2015-03-24 12:08:08 -05:00
Brian Jackson
cb3aa80c62
Don't overwrite salt variable
...
Using a variable named salt is a bad idea when salt already has a variable
named salt.
2015-03-16 23:39:32 -05:00
Niels Abspoel
5785091305
Added salt-api support
2015-03-08 00:01:28 +01:00
