diff --git a/apache/vhosts/standard.tmpl b/apache/vhosts/standard.tmpl index 71f7e70..414d003 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 = { @@ -89,7 +88,7 @@ {% 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 %} @@ -113,7 +112,7 @@ } %} - {% 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 %}