Browse Source

DocumentRoot: fallback to SiteName like templates

Templates already fallback to SiteName before site id.

This attemps to be consistent with them, and avoid having to explicitly specify
the DocumentRoot, when the template already does the proper inference.
tags/v0.37.4
Adrien "ze" Urban 6 years ago
parent
commit
0ed8f9a94b
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      apache/vhosts/standard.sls

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

@@ -4,7 +4,7 @@ include:
- apache

{% for id, site in salt['pillar.get']('apache:sites', {}).items() %}
{% set documentroot = site.get('DocumentRoot', '{0}/{1}'.format(apache.wwwdir, id)) %}
{% set documentroot = site.get('DocumentRoot', '{0}/{1}'.format(apache.wwwdir, site.get('ServerName', id))) %}

{{ id }}:
file:

Loading…
Cancel
Save