瀏覽代碼

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 6 年之前
父節點
當前提交
0ed8f9a94b
共有 1 個檔案被更改,包括 1 行新增1 行删除
  1. +1
    -1
      apache/vhosts/standard.sls

+ 1
- 1
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:

Loading…
取消
儲存