Skip to content
Snippets Groups Projects
Unverified Commit c07e5846 authored by Arthur Lutz's avatar Arthur Lutz Committed by GitHub
Browse files

[vhosts/standard] improve uniqueness of section id

parent 6f3ab21d
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
apache/vhosts/standard.sls
+ 2
− 3
View file @ c07e5846
...@@ -6,9 +6,8 @@ include: ...@@ -6,9 +6,8 @@ include:
{% 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, site.get('ServerName', id))) %} {% set documentroot = site.get('DocumentRoot', '{0}/{1}'.format(apache.wwwdir, site.get('ServerName', id))) %}
{{ id }}: {{ id }}-vhosts:
file: file.managed:
- managed
- name: {{ apache.vhostdir }}/{{ id }}{{ apache.confext }} - name: {{ apache.vhostdir }}/{{ id }}{{ apache.confext }}
- source: {{ site.get('template_file', 'salt://apache/vhosts/standard.tmpl') }} - source: {{ site.get('template_file', 'salt://apache/vhosts/standard.tmpl') }}
- template: {{ site.get('template_engine', 'jinja') }} - template: {{ site.get('template_engine', 'jinja') }}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment