Moved all Pillar examples under the same dictionary key

Having multiple different examples in the same file was causing
confusion.
This commit is contained in:
Seth House 2014-06-18 13:38:02 -06:00
parent 041fac4f48
commit b8f7ac33bf

View File

@ -9,12 +9,10 @@ apache:
logdir: /var/log/apache2 logdir: /var/log/apache2
wwwdir: /srv/apache2 wwwdir: /srv/apache2
# ``apache.mod_wsgi`` formula additional configuration: # ``apache.mod_wsgi`` formula additional configuration:
apache:
mod_wsgi: mod_wsgi mod_wsgi: mod_wsgi
# ``apache.vhosts`` formula additional configuration: # ``apache.vhosts`` formula additional configuration:
apache:
sites: sites:
# Default values below are used unless disabled by setting to 'False'. # 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 }} 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: example.net:
template_file: salt://apache/vhosts/minimal.tmpl template_file: salt://apache/vhosts/minimal.tmpl
# ``apache.debian_full`` formula additional configuration: # ``apache.debian_full`` formula additional configuration:
apache:
register-site: register-site:
# any name as an array index, and you can duplicate this section # any name as an array index, and you can duplicate this section
{{UNQIUE}}: {{UNQIUE}}: