Skip to content
Snippets Groups Projects
Commit 0ed8f9a9 authored by Adrien "ze" Urban's avatar Adrien "ze" Urban
Browse files

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.
parent da543013
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,7 @@ include: ...@@ -4,7 +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, id)) %} {% set documentroot = site.get('DocumentRoot', '{0}/{1}'.format(apache.wwwdir, site.get('ServerName', id))) %}
{{ id }}: {{ id }}:
file: file:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment