From f25d7707cf1a222cc246ec4e60bf66dea39656a4 Mon Sep 17 00:00:00 2001
From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
Date: Mon, 20 Mar 2017 16:57:47 +0100
Subject: [PATCH] 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
---
 apache/vhosts/standard.tmpl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apache/vhosts/standard.tmpl b/apache/vhosts/standard.tmpl
index d1cdb76..5873e8b 100644
--- a/apache/vhosts/standard.tmpl
+++ b/apache/vhosts/standard.tmpl
@@ -1,5 +1,4 @@
 {# 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 vals = {
@@ -90,7 +89,7 @@
 
     <Directory "{{ path }}">
         {% 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 %}
         {% else %}
         {% if dvals.get('Order') != False %}Order {{ dvals.Order }}{% endif %}
@@ -114,7 +113,7 @@
     } %}
 
     <Location "{{ path }}">
-        {% if apache.use_require %}
+        {% if map.use_require %}
         {%- if lvals.get('Require') != False %}Require {{lvals.Require}}{% endif %}
         {% else %}
         {%- if lvals.get('Order') != False %}Order {{ lvals.Order }}{% endif %}