Merge pull request #228 from ze42/docroot_sitename

DocumentRoot: fallback to SiteName like templates
2018-08-17 19:39:51 +02:00 · 2018-08-17 19:39:51 +02:00 · ac7e71bf56
commit ac7e71bf56
parent 32f92e8acd 0ed8f9a94b
1 changed files with 1 additions and 1 deletions
--- a/apache/vhosts/standard.sls
+++ b/apache/vhosts/standard.sls
@ -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: