From e7c9fbb152f3ba9610c875ebae3a6f42eb09a69c Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Thu, 17 Oct 2019 08:12:54 +0100 Subject: [PATCH] fix(vhosts/proxy.tmpl): fix `salt-lint` errors ```bash Examining apache/vhosts/proxy.tmpl of type state [206] Jinja variables should have spaces before and after: {{ var_name }} apache/vhosts/proxy.tmpl:38 [206] Jinja variables should have spaces before and after: {{ var_name }} apache/vhosts/proxy.tmpl:53 {% if site.get('SSLCertificateChainFile') %}SSLCertificateChainFile {{ site.SSLCertificateChainFile}}{% endif %} [206] Jinja variables should have spaces before and after: {{ var_name }} apache/vhosts/proxy.tmpl:85 {%- if lvals.get('Require') != False %}Require {{lvals.Require}}{% endif %} [206] Jinja variables should have spaces before and after: {{ var_name }} apache/vhosts/proxy.tmpl:102 {%- if lmvals.get('Require') != False %}Require {{lmvals.Require}}{% endif %} ``` --- apache/vhosts/proxy.tmpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apache/vhosts/proxy.tmpl b/apache/vhosts/proxy.tmpl index 4f45ecf..6511b51 100644 --- a/apache/vhosts/proxy.tmpl +++ b/apache/vhosts/proxy.tmpl @@ -35,7 +35,7 @@ 'Require': 'all granted', }, } %} - + ServerName {{ vals.ServerName }} {% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %} {% if site.get('ServerAdmin') != False %}ServerAdmin {{ vals.ServerAdmin }}{% endif %} @@ -50,7 +50,7 @@ {% 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 }} @@ -82,7 +82,7 @@ } %} {% if apache.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 %} @@ -99,7 +99,7 @@ } %} {% if apache.version == '2.4' %} - {%- if lmvals.get('Require') != False %}Require {{lmvals.Require}}{% endif %} + {%- if lmvals.get('Require') != False %}Require {{ lmvals.Require }}{% endif %} {% else %} {%- if lmvals.get('Order') != False %}Order {{ lmvals.Order }}{% endif %} {%- if lmvals.get('Allow') != False %}Allow {{ lmvals.Allow }}{% endif %}