Browse Source
Merge pull request #72 from wido/fix_register_site
Files in sites-available should end with .conf under Ubuntumaster
puneet kandhari
9 years ago
1 changed files with 3 additions and 3 deletions
+ 3
- 3
apache/register_site.sls
View File
| {{ 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 %} | ||||
| ########################################## | ########################################## |
Loading…