Merge pull request #146 from rhertzog/fix-vhost

Do not force usage of apache.config in apache.vhosts.standard
This commit is contained in:
Nitin Madhok 2016-06-30 18:13:31 +02:00 committed by GitHub
commit adc80edd39

View File

@ -2,7 +2,6 @@
include: include:
- apache - apache
- apache.config
{% 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, id)) %}