Browse Source

Merge pull request #237 from arthurlogilab/patch-3

[vhosts/standard] improve uniqueness of section id
tags/v0.37.4
Javier Bértoli 6 years ago
parent
commit
ff021d36aa
No account linked to committer's email address
1 changed files with 2 additions and 3 deletions
  1. +2
    -3
      apache/vhosts/standard.sls

+ 2
- 3
apache/vhosts/standard.sls View File

@@ -6,9 +6,8 @@ include:
{% for id, site in salt['pillar.get']('apache:sites', {}).items() %}
{% set documentroot = site.get('DocumentRoot', '{0}/{1}'.format(apache.wwwdir, site.get('ServerName', id))) %}

{{ id }}:
file:
- managed
apache_vhosts_{{ id }}:
file.managed:
- name: {{ apache.vhostdir }}/{{ id }}{{ apache.confext }}
- source: {{ site.get('template_file', 'salt://apache/vhosts/standard.tmpl') }}
- template: {{ site.get('template_engine', 'jinja') }}

Loading…
Cancel
Save