Browse Source

Merge pull request #96 from aboe76/rest_tornado

added rest_tornado to _defaults.conf
master
Nitin Madhok 10 years ago
parent
commit
22fe873c5b
2 changed files with 17 additions and 0 deletions
  1. +8
    -0
      pillar.example
  2. +9
    -0
      salt/files/master.d/_defaults.conf

+ 8
- 0
pillar.example View File

@@ -19,6 +19,14 @@ salt:
file_roots:
base:
- /srv/salt

# for salt-api with tornado rest interface
rest_tornado:
port: 8000
ssl_crt: /etc/pki/api/certs/server.crt
ssl_key: /etc/pki/api/certs/server.key
debug: False
disable_ssl: False
# salt minion config:
minion:

+ 9
- 0
salt/files/master.d/_defaults.conf View File

@@ -947,6 +947,15 @@ rest_cherrypy:
{%- endfor %}
{%- endif %}

{% if 'rest_tornado' in cfg_master %}
##### rest_tornado #####
###########################################
rest_tornado:
{% for name, value in cfg_master['rest_tornado'].items() %}
{{ name }}: {{ value }}
{%- endfor %}
{%- endif %}

{% if 'presence_events' in cfg_master %}
##### presence events #####
##########################################

Loading…
Cancel
Save