From b8f7ac33bfb288dbac6e8c212b99df855caf4947 Mon Sep 17 00:00:00 2001 From: Seth House Date: Wed, 18 Jun 2014 13:38:02 -0600 Subject: [PATCH] Moved all Pillar examples under the same dictionary key Having multiple different examples in the same file was causing confusion. --- pillar.example | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pillar.example b/pillar.example index 9088175..e768da7 100644 --- a/pillar.example +++ b/pillar.example @@ -9,12 +9,10 @@ apache: logdir: /var/log/apache2 wwwdir: /srv/apache2 -# ``apache.mod_wsgi`` formula additional configuration: -apache: + # ``apache.mod_wsgi`` formula additional configuration: mod_wsgi: mod_wsgi -# ``apache.vhosts`` formula additional configuration: -apache: + # ``apache.vhosts`` formula additional configuration: sites: # Default values below are used unless disabled by setting to 'False'. example.com: # must be unique; used as an ID declaration in Salt; also passed to the template context as {{ id }} @@ -52,8 +50,7 @@ apache: example.net: template_file: salt://apache/vhosts/minimal.tmpl -# ``apache.debian_full`` formula additional configuration: -apache: + # ``apache.debian_full`` formula additional configuration: register-site: # any name as an array index, and you can duplicate this section {{UNQIUE}}: