Merge pull request #44 from RyPeck/feature/optional_template_register_sites

Add optional templating to register_site files
This commit is contained in:
Nitin Madhok 2015-03-18 13:48:13 -04:00
commit 241f2be82e
2 changed files with 11 additions and 0 deletions

View File

@ -38,6 +38,13 @@
- user: root - user: root
- group: root - group: root
- mode: 775 - mode: 775
{% if 'template' in pillar['apache']['register-site'][site] and 'defaults' in pillar['apache']['register-site'][site] %}
- template: jinja
- defaults:
{% for key, value in pillar['apache']['register-site'][site]['defaults'].iteritems() %}
{{ key }}: {{ value }}
{% endfor %}
{% endif %}
- watch_in: - watch_in:
- cmd: {{ a2modid }} - cmd: {{ a2modid }}
- module: apache-reload - module: apache-reload

View File

@ -81,6 +81,10 @@ apache:
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'
# Optional - use managed file as Jinja Template
#template: true
#defaults:
# custom_var: "default value"
modules: modules:
enabled: # List modules to enable enabled: # List modules to enable