From 1bad58d899e1cb753c907e955afab8abd926a86e Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 17 Oct 2019 08:16:03 +0100 Subject: [PATCH] fix(vhosts/standard.tmpl): fix `salt-lint` errors ```bash Examining apache/vhosts/standard.tmpl of type state [206] Jinja variables should have spaces before and after: {{ var_name }} apache/vhosts/standard.tmpl:46 [206] Jinja variables should have spaces before and after: {{ var_name }} apache/vhosts/standard.tmpl:70 {% if site.get('SSLCertificateChainFile') %}SSLCertificateChainFile {{ site.SSLCertificateChainFile}}{% endif %} [201] Trailing whitespace apache/vhosts/standard.tmpl:72 [206] Jinja variables should have spaces before and after: {{ var_name }} apache/vhosts/standard.tmpl:96 {% if dvals.get('Require') != False %}Require {{dvals.Require}}{% endif %} [206] Jinja variables should have spaces before and after: {{ var_name }} apache/vhosts/standard.tmpl:120 {%- if lvals.get('Require') != False %}Require {{lvals.Require}}{% endif %} ``` --- apache/vhosts/standard.tmpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apache/vhosts/standard.tmpl b/apache/vhosts/standard.tmpl index ff79e1f..ed662df 100644 --- a/apache/vhosts/standard.tmpl +++ b/apache/vhosts/standard.tmpl @@ -43,7 +43,7 @@ }, } -%} - + ServerName {{ vals.ServerName }} {% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %} @@ -67,9 +67,9 @@ {% if site.get('SSLCertificateFile') %}SSLEngine on SSLCertificateFile {{ site.SSLCertificateFile }} {% if site.get('SSLCertificateKeyFile') %}SSLCertificateKeyFile {{ site.SSLCertificateKeyFile }}{% endif %} - {% if site.get('SSLCertificateChainFile') %}SSLCertificateChainFile {{ site.SSLCertificateChainFile}}{% endif %} + {% if site.get('SSLCertificateChainFile') %}SSLCertificateChainFile {{ site.SSLCertificateChainFile }}{% endif %} {% endif %} - + {% if site.get('Rewrite') %}RewriteEngine on {{ site.Rewrite }} {% endif %} @@ -93,7 +93,7 @@ {% if dvals.get('Options') != False %}Options {{ dvals.Options }}{% endif %} {% if map.version == '2.4' %} - {% if dvals.get('Require') != False %}Require {{dvals.Require}}{% endif %} + {% if dvals.get('Require') != False %}Require {{ dvals.Require }}{% endif %} {% else %} {% if dvals.get('Order') != False %}Order {{ dvals.Order }}{% endif %} {% if dvals.get('Allow') != False %}Allow {{ dvals.Allow }}{% endif %} @@ -117,7 +117,7 @@ {% if map.version == '2.4' %} - {%- if lvals.get('Require') != False %}Require {{lvals.Require}}{% endif %} + {%- if lvals.get('Require') != False %}Require {{ lvals.Require }}{% endif %} {% else %} {%- if lvals.get('Order') != False %}Order {{ lvals.Order }}{% endif %} {%- if lvals.get('Allow') != False %}Allow {{ lvals.Allow }}{% endif %}