saltstack-formulas/apache-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #237 from arthurlogilab/patch-3

Browse Source 
[vhosts/standard] improve uniqueness of section id
This commit is contained in:
Javier Bértoli 2018-09-11 09:22:05 -03:00 committed by GitHub
commit ff021d36aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apache/vhosts/standard.sls
View File

@ -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 }}: apache_vhosts_{{ id }}:
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') }}