Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2024-11-28 02:57:50 +01:00
Code Issues Activity

Merge pull request #96 from aboe76/rest_tornado

Browse Source 
added rest_tornado to _defaults.conf
This commit is contained in:
Nitin Madhok 2015-02-06 23:22:52 +05:30
commit 22fe873c5b
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pillar.example
View File

@ -19,6 +19,14 @@ salt:
file_roots: file_roots:
base: base:
- /srv/salt - /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: # salt minion config:
minion: minion:

9
salt/files/master.d/_defaults.conf
View File

@ -947,6 +947,15 @@ rest_cherrypy:
{%- endfor %} {%- endfor %}
{%- endif %} {%- 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 %} {% if 'presence_events' in cfg_master %}
##### presence events ##### ##### presence events #####
########################################## ##########################################