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

fix standard.tmpl

Browse Source 
with salt-ssh-2016.11.3 it errored out with
TemplateNotFound: apache/map.jinja

and we were already passing in the 'apache' data as 'map'
from standard.sls
This commit is contained in:
Bernhard M. Wiedemann 2017-03-20 16:57:47 +01:00
parent 3f3e734cd7
commit f25d7707cf
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.tmpl
View File

@ -1,5 +1,4 @@
{# Define default values here so the template below can just focus on layout #} {# Define default values here so the template below can just focus on layout #}
{%- from "apache/map.jinja" import apache with context -%}
{%- set sitename = site.get('ServerName', id) -%} {%- set sitename = site.get('ServerName', id) -%}
{%- set vals = { {%- set vals = {
@ -90,7 +89,7 @@
<Directory "{{ path }}"> <Directory "{{ path }}">
{% if dvals.get('Options') != False %}Options {{ dvals.Options }}{% endif %} {% if dvals.get('Options') != False %}Options {{ dvals.Options }}{% endif %}
{% if apache.use_require %} {% if map.use_require %}
{% if dvals.get('Require') != False %}Require {{dvals.Require}}{% endif %} {% if dvals.get('Require') != False %}Require {{dvals.Require}}{% endif %}
{% else %} {% else %}
{% if dvals.get('Order') != False %}Order {{ dvals.Order }}{% endif %} {% if dvals.get('Order') != False %}Order {{ dvals.Order }}{% endif %}
@ -114,7 +113,7 @@
} %} } %}
<Location "{{ path }}"> <Location "{{ path }}">
{% if apache.use_require %} {% if map.use_require %}
{%- if lvals.get('Require') != False %}Require {{lvals.Require}}{% endif %} {%- if lvals.get('Require') != False %}Require {{lvals.Require}}{% endif %}
{% else %} {% else %}
{%- if lvals.get('Order') != False %}Order {{ lvals.Order }}{% endif %} {%- if lvals.get('Order') != False %}Order {{ lvals.Order }}{% endif %}