Files in sites-available should end with .conf under Ubuntu

This commit is contained in:
Wido den Hollander 2015-08-21 17:10:21 +02:00 committed by Wido den Hollander
parent e84b76ab01
commit def448db2f

View File

@ -15,14 +15,14 @@
{{ a2modid }}:
cmd.run:
{% 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'] }}.conf
{% else %}
- onlyif: test -f /etc/apache2/sites-enabled/{{ pillar['apache']['register-site'][site]['name'] }}
- onlyif: test -f /etc/apache2/sites-enabled/{{ pillar['apache']['register-site'][site]['name'] }}.conf
{% endif %}
- order: 230
- require:
- pkg: apache
- file: /etc/apache2/sites-available/{{ pillar['apache']['register-site'][site]['name'] }}
- file: /etc/apache2/sites-available/{{ pillar['apache']['register-site'][site]['name'] }}.conf
{% endif %}
##########################################