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

Merge pull request #42 from RyPeck/bugfix/a2dissite_from_pillar

Browse Source 
Fix case where state != enabled causes error
This commit is contained in:
Nitin Madhok 2015-03-10 17:13:06 -04:00
commit 93745004ca
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

@ -8,10 +8,11 @@
{% if 'name' in pillar['apache']['register-site'][site] and 'state' in pillar['apache']['register-site'][site] %} {% if 'name' in pillar['apache']['register-site'][site] and 'state' in pillar['apache']['register-site'][site] %}
{% if pillar['apache']['register-site'][site]['state'] == 'enabled' %} {% if pillar['apache']['register-site'][site]['state'] == 'enabled' %}
a2ensite {{ pillar['apache']['register-site'][site]['name'] }}: {% set a2modid = "a2ensite " ~ pillar['apache']['register-site'][site]['name'] %}
{% else %} {% else %}
a2dissite {{ pillar['apache']['register-site'][site]['name'] }}: {% set a2modid = "a2dissite " ~ pillar['apache']['register-site'][site]['name'] %}
{% endif %} {% endif %}
{{ 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'] }} - unless: test -f /etc/apache2/sites-enabled/{{ pillar['apache']['register-site'][site]['name'] }}
@ -38,7 +39,7 @@ a2dissite {{ pillar['apache']['register-site'][site]['name'] }}:
- group: root - group: root
- mode: 775 - mode: 775
- watch_in: - watch_in:
- cmd: a2ensite {{ pillar['apache']['register-site'][site]['name'] }} - cmd: {{ a2modid }}
- module: apache-reload - module: apache-reload
{% endif %} {% endif %}