Merge pull request #11 from KennethWilke/master

fixed pillar example, updated minion template
saltstack-formulas · Aug 14, 2013 · b8cbf60 · b8cbf60
2 parents 9a52c65 + a940766
commit b8cbf60
Show file tree

Hide file tree

Showing 3 changed files with 210 additions and 89 deletions.
diff --git a/README.rst b/README.rst
@@ -11,7 +11,11 @@ Install a minion
 salt.master
 ===========
 
-Install a master. Every option available in the master template can be set in the pillar file:
+Install a master.
+
+Configuration
+=============
+Every option available in the templates can be set in pillar. Settings under 'salt' will be overridden by more specific settings under salt['master'] or salt['minion']
 
 ::
 

diff --git a/pillar.example b/pillar.example
@@ -6,7 +6,7 @@ salt:
     gitfs_remotes:
       - git://github.com/saltstack-formulas/salt-formula.git
     file_roots:
-      - base:
+      base:
         - /srv/salt
   minion:
     master: salt