From 7ddc1692ecb17ae0c77e4b07c48a1baef3d36fdc Mon Sep 17 00:00:00 2001
From: Niels Abspoel <aboe76@gmail.com>
Date: Thu, 5 Feb 2015 22:07:54 +0100
Subject: [PATCH] added rest_tornado to _defaults.conf

see pillar.example for configuration
---
 pillar.example                     | 8 ++++++++
 salt/files/master.d/_defaults.conf | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/pillar.example b/pillar.example
index 6ed3d62..a4a366b 100644
--- a/pillar.example
+++ b/pillar.example
@@ -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:
diff --git a/salt/files/master.d/_defaults.conf b/salt/files/master.d/_defaults.conf
index 0f9e297..4b5a280 100644
--- a/salt/files/master.d/_defaults.conf
+++ b/salt/files/master.d/_defaults.conf
@@ -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         #####
 ##########################################