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

Merge pull request #140 from Nytoca/patch-1

Browse Source 
Proper disabling of the default vhost
This commit is contained in:
Wolodja Wentland 2016-05-18 21:51:59 +02:00
commit eaffddb0d0
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apache/no_default_vhost.sls
View File

@ -5,12 +5,12 @@
include: include:
- apache - apache
apache_no-default-vhost: a2dissite 000-default.conf:
file.absent: cmd.run:
- name: {{ apache.vhostdir }}/000-default.conf - unless: test ! -f /etc/apache2/sites-enabled/000-default.conf
- require: - require:
- pkg: apache - pkg: apache
- watch_in: - watch_in:
- module: apache-reload - module: apache-reload
{% endif %} {% endif %}

6
apache/vhosts/standard.sls
View File

@ -34,8 +34,7 @@ include:
{% if grains.os_family == 'Debian' %} {% if grains.os_family == 'Debian' %}
{% if site.get('enabled', True) %} {% if site.get('enabled', True) %}
a2ensite {{ id }}{{ apache.confext }}: a2ensite {{ id }}{{ apache.confext }}:
cmd: cmd.run:
- run
- unless: test -f /etc/apache2/sites-enabled/{{ id }}{{ apache.confext }} - unless: test -f /etc/apache2/sites-enabled/{{ id }}{{ apache.confext }}
- require: - require:
- file: /etc/apache2/sites-available/{{ id }}{{ apache.confext }} - file: /etc/apache2/sites-available/{{ id }}{{ apache.confext }}
@ -43,8 +42,7 @@ a2ensite {{ id }}{{ apache.confext }}:
- module: apache-reload - module: apache-reload
{% else %} {% else %}
a2dissite {{ id }}{{ apache.confext }}: a2dissite {{ id }}{{ apache.confext }}:
cmd: cmd.run:
- run
- onlyif: test -f /etc/apache2/sites-enabled/{{ id }}{{ apache.confext }} - onlyif: test -f /etc/apache2/sites-enabled/{{ id }}{{ apache.confext }}
- require: - require:
- file: /etc/apache2/sites-available/{{ id }}{{ apache.confext }} - file: /etc/apache2/sites-available/{{ id }}{{ apache.confext }}