Browse Source

fix standard.tmpl

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
master
Bernhard M. Wiedemann 7 years ago
parent
commit
f25d7707cf
1 changed files with 2 additions and 3 deletions
  1. +2
    -3
      apache/vhosts/standard.tmpl

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

{# 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 = {


<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 %}
} %} } %}


<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 %}

Loading…
Cancel
Save