added rest_tornado to _defaults.conf

see pillar.example for configuration
This commit is contained in:
Niels Abspoel 2015-02-05 22:07:54 +01:00
parent f39fff2329
commit 7ddc1692ec
2 changed files with 17 additions and 0 deletions

View File

@ -20,6 +20,14 @@ salt:
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:
master: salt

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 #####
##########################################