saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed Jinja-esque placeholders from example Pillar; added instructions

Browse Source 
The structure of this example file was quite confusing. Most of these
values are not required and should be denoted as such. Jinja notiation
to denote re-used Pillar values was also a bad and confusing choice.

Closes #8
This commit is contained in:
Seth House 2014-06-18 13:48:28 -06:00
parent b8f7ac33bf
commit 280ea54a65
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pillar.example
View File

@ -14,27 +14,40 @@ apache:
# ``apache.vhosts`` formula additional configuration: # ``apache.vhosts`` formula additional configuration:
sites: sites:
# Default values below are used unless disabled by setting to 'False'. example.net:
example.com: # must be unique; used as an ID declaration in Salt; also passed to the template context as {{ id }} template_file: salt://apache/vhosts/minimal.tmpl
example.com: # must be unique; used as an ID declaration in Salt.
template_file: salt://apache/vhosts/standard.tmpl template_file: salt://apache/vhosts/standard.tmpl
####################### DEFAULT VALUES BELOW ############################
# NOTE: the values below are simply default settings that *can* be
# overridden and are not required in order to use this formula to create
# vhost entries.
#
# Do not copy the values below into your Pillar unless you intend to
# modify these vaules.
####################### DEFAULT VALUES BELOW ############################
template_engine: jinja template_engine: jinja
interface: '*' interface: '*'
port: '80' port: '80'
ServerName: {{ id }} # uses the unique ID above unless specified ServerName: example.com # uses the unique ID above unless specified
ServerAlias: www.{{ id }} ServerAlias: www.example.com
ServerAdmin: webmaster@{{ id }} ServerAdmin: webmaster@example.com
LogLevel: warn LogLevel: warn
ErrorLog: {{ logdir }}/{{ id }}-error.log # E.g.: /var/log/apache2/example.com-error.log ErrorLog: /path/to/logs/example.com-error.log # E.g.: /var/log/apache2/example.com-error.log
CustomLog: {{ logdir }}/{{ id }}-access.log # E.g.: /var/log/apache2/example.com-access.log CustomLog: /path/to/logs/example.com-access.log # E.g.: /var/log/apache2/example.com-access.log
DocumentRoot: {{ wwwdir }}/{{ id }} # E.g., /var/www/example.com DocumentRoot: /path/to/www/dir/example.com # E.g., /var/www/example.com
Directory: Directory:
default: # "default" is a special case; Adds ``{{ wwwdir }}/{{ id }}`` e.g.: /var/www/example.com # "default" is a special case; Adds ``/path/to/www/dir/example.com``
# E.g.: /var/www/example.com
default:
Options: -Indexes FollowSymLinks Options: -Indexes FollowSymLinks
Order: allow,deny Order: allow,deny
Allow: from all Allow: from all
@ -47,13 +60,10 @@ apache:
Additional config as a Additional config as a
multi-line string here multi-line string here
example.net:
template_file: salt://apache/vhosts/minimal.tmpl
# ``apache.debian_full`` formula additional configuration: # ``apache.debian_full`` formula additional configuration:
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}}: UNIQUE_VALUE_HERE:
name: 'my name' name: 'my name'
path: 'salt://path/to/sites-available/conf/file' path: 'salt://path/to/sites-available/conf/file'
state: 'enabled' state: 'enabled'