Browse Source

Merge pull request #49 from multani/fix-missing-documentroot

Don't fail on missing DocumentRoot
master
Forrest 9 years ago
parent
commit
b190357ebf
1 changed files with 3 additions and 1 deletions
  1. +3
    -1
      apache/vhosts/standard.sls

+ 3
- 1
apache/vhosts/standard.sls View File

- pkg: apache - pkg: apache
- 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 {{ site.get('DocumentRoot') }}
- name: {{ site.get('DocumentRoot') }} - name: {{ site.get('DocumentRoot') }}
- makedirs: True - makedirs: True
{% endif %}


{% if grains.os_family == 'Debian' %} {% if grains.os_family == 'Debian' %}
a2ensite {{ id }}{{ apache.confext }}: a2ensite {{ id }}{{ apache.confext }}:

Loading…
Cancel
Save