From d0df360e5dd21203c70939678e86fd66fb8f84c0 Mon Sep 17 00:00:00 2001
From: Kenneth Wilke <kenneth.wilke@rackspace.com>
Date: Mon, 12 Aug 2013 16:45:39 -0500
Subject: [PATCH 1/7] Removed template refs, quoted log_datefmt_logfile

---
 salt/files/master |  2 +-
 salt/master.sls   | 23 -----------------------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/salt/files/master b/salt/files/master
index 01ec49c..de4ea89 100644
--- a/salt/files/master
+++ b/salt/files/master
@@ -488,7 +488,7 @@ log_level_logfile: {{ salt.get('log_level_logfile', 'warning') }}
 # The date and time format used in log messages. Allowed date/time formating
 # can be seen here: http://docs.python.org/library/time.html#time.strftime
 #log_datefmt: '%H:%M:%S'
-log_datefmt_logfile: {{ salt.get('log_datefmt_logfile', '%Y-%m-%d %H:%M:%S') }}
+log_datefmt_logfile: '{{ salt.get('log_datefmt_logfile', '%Y-%m-%d %H:%M:%S') }}'
 
 # The format of the console logging messages. Allowed formatting options can
 # be seen here: http://docs.python.org/library/logging.html#logrecord-attributes
diff --git a/salt/master.sls b/salt/master.sls
index bcb404d..7b71c88 100644
--- a/salt/master.sls
+++ b/salt/master.sls
@@ -15,26 +15,3 @@ salt-master:
       - pkg: salt-minion
     - watch:
       - file: salt-minion
-
-configure-salt-master:
-  file.managed:
-    - name: /etc/salt/master
-    - source: salt://salt/templates/master.template
-    - template: jinja
-    - user: root
-    - groupt: root
-    - mode: 0700
-
-run-salt-master:
-  cmd.wait:
-    - name: start salt-master
-    - watch:
-      - file: run-salt-master
-    - require:
-      - file: configure-salt-master
-  file.managed:
-    - name: /etc/init/salt-master
-    - source: salt://salt/templates/upstart-master.conf
-    - template: jinja
-    - defaults:
-        run_mode: master

From b1903eea83d9311af26629f0852afb0929f542e9 Mon Sep 17 00:00:00 2001
From: Kenneth Wilke <kenneth.wilke@rackspace.com>
Date: Mon, 12 Aug 2013 17:10:45 -0500
Subject: [PATCH 2/7] fixed log format string

---
 salt/files/master | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/files/master b/salt/files/master
index de4ea89..f295e8e 100644
--- a/salt/files/master
+++ b/salt/files/master
@@ -493,7 +493,7 @@ log_datefmt_logfile: '{{ salt.get('log_datefmt_logfile', '%Y-%m-%d %H:%M:%S') }}
 # The format of the console logging messages. Allowed formatting options can
 # be seen here: http://docs.python.org/library/logging.html#logrecord-attributes
 #log_fmt_console: '[%(levelname)-8s] %(message)s'
-log_fmt_logfile: {{ salt.get('log_fmt_logfile', '%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s')}}
+log_fmt_logfile: '{{ salt.get('log_fmt_logfile', '%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s')}}'
 
 # This can be used to control logging levels more specificically.  This
 # example sets the main salt library at the 'warning' level, but sets

From 76684f638d884027f6e8486558705d3a47887c96 Mon Sep 17 00:00:00 2001
From: Kenneth Wilke <kenneth.wilke@rackspace.com>
Date: Mon, 12 Aug 2013 17:33:02 -0500
Subject: [PATCH 3/7] changed master require to watch, and both to salt-master

---
 salt/master.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/salt/master.sls b/salt/master.sls
index 7b71c88..669b1d1 100644
--- a/salt/master.sls
+++ b/salt/master.sls
@@ -12,6 +12,6 @@ salt-master:
   service.running:
     - enable: True
     - require:
-      - pkg: salt-minion
     - watch:
-      - file: salt-minion
+      - pkg: salt-master
+      - file: salt-master

From b9d2e2f9d4d2ba13fc5b70885373641745478a2a Mon Sep 17 00:00:00 2001
From: Kenneth Wilke <kenneth.wilke@rackspace.com>
Date: Mon, 12 Aug 2013 17:33:28 -0500
Subject: [PATCH 4/7] changed salt-master package to salt-master

---
 salt/master.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/master.sls b/salt/master.sls
index 669b1d1..fe429f9 100644
--- a/salt/master.sls
+++ b/salt/master.sls
@@ -1,7 +1,7 @@
 salt-master:
   pkg.installed:
     {% if grains['os_family'] in ['RedHat', 'Debian'] %}
-    - name: salt-minion
+    - name: salt-master
     {% else %}
     - name: salt
     {% endif %}

From 48d89a5485e3ebc06d36d7efc0692985fde6fb79 Mon Sep 17 00:00:00 2001
From: Kenneth Wilke <kenneth.wilke@rackspace.com>
Date: Mon, 12 Aug 2013 17:35:25 -0500
Subject: [PATCH 5/7] added pillar example

---
 pillar.example | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pillar.example b/pillar.example
index e69de29..8cb7938 100644
--- a/pillar.example
+++ b/pillar.example
@@ -0,0 +1,12 @@
+salt:
+  master:
+    fileserver_backend:
+      - git
+      - roots
+    gitfs_remotes:
+      - git://github.com/KennethWilke/salt-formula.git
+    file_roots:
+      - base:
+        - /srv/salt
+  minion:
+    master: salt

From 3634e3d8334dff1b704a95200362ca596a9d9240 Mon Sep 17 00:00:00 2001
From: Kenneth Wilke <kenneth.wilke@rackspace.com>
Date: Mon, 12 Aug 2013 17:36:36 -0500
Subject: [PATCH 6/7] removed bad require line

---
 salt/master.sls | 1 -
 1 file changed, 1 deletion(-)

diff --git a/salt/master.sls b/salt/master.sls
index fe429f9..f4fb679 100644
--- a/salt/master.sls
+++ b/salt/master.sls
@@ -11,7 +11,6 @@ salt-master:
     - source: salt://salt/files/master
   service.running:
     - enable: True
-    - require:
     - watch:
       - pkg: salt-master
       - file: salt-master

From 8060db1c7b22d74cb9d9f295d03b5708aa5264af Mon Sep 17 00:00:00 2001
From: Kenneth Wilke <kenneth.wilke@rackspace.com>
Date: Mon, 12 Aug 2013 17:37:38 -0500
Subject: [PATCH 7/7] used saltstack formulas repo instead of my own

---
 pillar.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pillar.example b/pillar.example
index 8cb7938..b722cce 100644
--- a/pillar.example
+++ b/pillar.example
@@ -4,7 +4,7 @@ salt:
       - git
       - roots
     gitfs_remotes:
-      - git://github.com/KennethWilke/salt-formula.git
+      - git://github.com/saltstack-formulas/salt-formula.git
     file_roots:
       - base:
         - /srv/salt