From be1cd4ff73b3598a18fd6d59ea4e3002817a66ed Mon Sep 17 00:00:00 2001
From: Kenneth Wilke <kenneth.wilke@rackspace.com>
Date: Tue, 13 Aug 2013 12:20:10 -0500
Subject: [PATCH] Overhauled master config template

---
 salt/files/master | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/salt/files/master b/salt/files/master
index f295e8e..8d92aa3 100644
--- a/salt/files/master
+++ b/salt/files/master
@@ -1,8 +1,7 @@
-# This file managed by Salt, do not edit!!
+# This file managed by Salt, do not edit by hand!!
+#  Based on salt version 0.16.3 default config
 {% set salt = pillar.get('salt', {}) -%}
 {% set master = salt.get('master', {}) -%}
-#
-#
 ##### Primary configuration settings #####
 ##########################################
 # This configuration file is used to manage the behavior of the Salt Master
@@ -13,10 +12,18 @@
 # Per default, the master will automatically include all config files
 # from master.d/*.conf (master.d is a directory in the same directory
 # as the main master config file)
+{%- if 'default_include' in master %}
+default_include: {{ master['default_include'] }}
+{% else %}
 #default_include: master.d/*.conf
+{%- endif %}
 
 # The address of the interface to bind to
-interface: {{ master.get('interface', '0.0.0.0') }}
+{%- if 'interface' in master %}
+interface: {{ master['interface'] }}
+{% else %}
+#interface: 0.0.0.0
+{%- endif %}
 
 # The tcp port used by the publisher
 #publish_port: {{ salt.get('publish_port', 4505) }}