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

Merge pull request #228 from ze42/docroot_sitename

Browse Source 
DocumentRoot: fallback to SiteName like templates
This commit is contained in:
Niels Abspoel 2018-08-17 19:39:51 +02:00 committed by GitHub
commit ac7e71bf56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache/vhosts/standard.sls
View File

@ -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: