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.
This commit is contained in:
Adrien "ze" Urban 2018-05-22 15:19:52 +02:00
parent da543013f4
commit 0ed8f9a94b

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: