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

allow absence of DocumentRoot

Browse Source 
DocumentRoot is useless for a plain redirect or proxy vhost, no need to
force creating the directory.

Signed-off-by: Julien Cristau <julien.cristau@logilab.fr>
This commit is contained in:
Julien Cristau 2015-09-21 15:47:46 +02:00
parent 9bd6873d27
commit 9be8ade5aa
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache/vhosts/standard.sls
View File

@ -21,11 +21,13 @@ include:
- watch_in: - watch_in:
- module: apache-reload - module: apache-reload
{% if site.get('DocumentRoot') != False %}
{{ id }}-documentroot: {{ id }}-documentroot:
file.directory: file.directory:
- unless: test -d {{ documentroot }} - unless: test -d {{ documentroot }}
- name: {{ documentroot }} - name: {{ documentroot }}
- makedirs: True - makedirs: True
{% endif %}
{% if grains.os_family == 'Debian' %} {% if grains.os_family == 'Debian' %}
{% if site.get('enabled') %} {% if site.get('enabled') %}