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

Create defaul vhost directories when DocumentRoot is not set

Browse Source
This commit is contained in:
Cody Hiar 2015-05-31 12:17:25 -06:00
parent fffb47518e
commit 07b2a9f9f5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apache/vhosts/standard.sls
View File

@ -4,6 +4,7 @@ include:
- apache - apache
{% for id, site in salt['pillar.get']('apache:sites', {}).items() %} {% for id, site in salt['pillar.get']('apache:sites', {}).items() %}
{% set documentroot = site.get('DocumentRoot', '{0}/{1}'.format(apache.wwwdir, sitename)) %}
{{ id }}: {{ id }}:
file: file:
@ -20,13 +21,11 @@ include:
- watch_in: - watch_in:
- module: apache-reload - module: apache-reload
{% if 'DocumentRoot' in site %}
{{ id }}-documentroot: {{ id }}-documentroot:
file.directory: file.directory:
- unless: test -d {{ site.get('DocumentRoot') }} - unless: test -d {{ documentroot }}
- name: {{ site.get('DocumentRoot') }} - name: {{ documentroot }}
- makedirs: True - makedirs: True
{% endif %}
{% if grains.os_family == 'Debian' %} {% if grains.os_family == 'Debian' %}
a2ensite {{ id }}{{ apache.confext }}: a2ensite {{ id }}{{ apache.confext }}: