Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed pillar example, updated minion template #11

Merged
merged 3 commits into from
Aug 14, 2013
Merged

fixed pillar example, updated minion template #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71418cd
pillar example fix
Aug 13, 2013
2420b85
overhauled minion template
Aug 14, 2013
a940766
updated readme
Aug 14, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']

::

Expand Down
2 changes: 1 addition & 1 deletion pillar.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ salt:
gitfs_remotes:
- git://github.com/saltstack-formulas/salt-formula.git
file_roots:
- base:
base:
- /srv/salt
minion:
master: salt
Loading