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

Merge pull request #78 from eliasp/correct-confext-usage

Browse Source 
Use 'apache.confext' instead of hardcoding '.conf'
This commit is contained in:
puneet kandhari 2015-08-28 07:39:43 -05:00
commit 7406e62d23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apache/register_site.sls
View File

@ -1,3 +1,4 @@
{% from "apache/map.jinja" import apache with context %}
{% if grains['os_family']=="Debian" %} {% if grains['os_family']=="Debian" %}
{% if 'apache' in pillar and 'register-site' in pillar['apache'] %} #BEGIN: ['apache']['register-site'] {% if 'apache' in pillar and 'register-site' in pillar['apache'] %} #BEGIN: ['apache']['register-site']
@ -15,14 +16,14 @@
{{ a2modid }}: {{ a2modid }}:
cmd.run: cmd.run:
{% if pillar['apache']['register-site'][site]['state'] == 'enabled' %} {% if pillar['apache']['register-site'][site]['state'] == 'enabled' %}
- unless: test -f /etc/apache2/sites-enabled/{{ pillar['apache']['register-site'][site]['name'] }}.conf - unless: test -f /etc/apache2/sites-enabled/{{ pillar['apache']['register-site'][site]['name'] }}{{ apache.confext }}
{% else %} {% else %}
- onlyif: test -f /etc/apache2/sites-enabled/{{ pillar['apache']['register-site'][site]['name'] }}.conf - onlyif: test -f /etc/apache2/sites-enabled/{{ pillar['apache']['register-site'][site]['name'] }}{{ apache.confext }}
{% endif %} {% endif %}
- order: 230 - order: 230
- require: - require:
- pkg: apache - pkg: apache
- file: /etc/apache2/sites-available/{{ pillar['apache']['register-site'][site]['name'] }}.conf - file: /etc/apache2/sites-available/{{ pillar['apache']['register-site'][site]['name'] }}{{ apache.confext }}
{% endif %} {% endif %}
########################################## ##########################################