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

Don't fail on missing DocumentRoot

Browse Source 
If the DocumentRoot value wasn't set, applying the state would cause the
following error:

          ID: site.example.com-documentroot
    Function: file.directory
        Name: None
      Result: False
     Comment: Specified file None is not an absolute path
     Started: 15:07:05.596723
    Duration: 4.929 ms
     Changes:

This fixes the problem by not trying to check for the DocumentRoot directory is
the value is missing.
This commit is contained in:
Jonathan Ballet 2015-03-25 15:06:18 +01:00
parent 0e2dd72e43
commit 42426f3f4a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apache/vhosts/standard.sls
View File

@ -19,12 +19,14 @@ include:
- pkg: apache
- watch_in:
- module: apache-reload
{% if 'DocumentRoot' in site %}
{{ id }}-documentroot:
file.directory:
- unless: test -d {{ site.get('DocumentRoot') }}
- name: {{ site.get('DocumentRoot') }}
- makedirs: True
{% endif %}
{% if grains.os_family == 'Debian' %}
a2ensite {{ id }}{{ apache.confext }}: