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

Merge pull request #72 from wido/fix_register_site

Browse Source 
Files in sites-available should end with .conf under Ubuntu
This commit is contained in:
puneet kandhari 2015-08-21 12:19:06 -05:00
commit b59ef46304
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apache/register_site.sls
View File

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