Explorar el Código

Merge pull request #96 from aboe76/rest_tornado

added rest_tornado to _defaults.conf
tags/v0.57.0
Nitin Madhok hace 9 años
padre
commit
22fe873c5b
Se han modificado 2 ficheros con 17 adiciones y 0 borrados
  1. +8
    -0
      pillar.example
  2. +9
    -0
      salt/files/master.d/_defaults.conf

+ 8
- 0
pillar.example Ver fichero

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
- 0
salt/files/master.d/_defaults.conf Ver fichero

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

Cargando…
Cancelar
Guardar