Quellcode durchsuchen

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 vor 6 Jahren
Ursprung
Commit
0ed8f9a94b
1 geänderte Dateien mit 1 neuen und 1 gelöschten Zeilen
  1. +1
    -1
      apache/vhosts/standard.sls

+ 1
- 1
apache/vhosts/standard.sls Datei anzeigen

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

Laden…
Abbrechen
Speichern