Skip to content

Commit 1bad58d

Browse files
committed
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 <VirtualHost {% for intf in vals.interfaces %} {{intf}}:{{ vals.port }}{% endfor -%}> [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 %} ```
1 parent 0a41b19 commit 1bad58d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

apache/vhosts/standard.tmpl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
},
4444
} -%}
4545

46-
<VirtualHost {% for intf in vals.interfaces %} {{intf}}:{{ vals.port }}{% endfor -%}>
46+
<VirtualHost {% for intf in vals.interfaces %} {{ intf }}:{{ vals.port }}{% endfor -%}>
4747
ServerName {{ vals.ServerName }}
4848
{% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %}
4949

@@ -67,9 +67,9 @@
6767
{% if site.get('SSLCertificateFile') %}SSLEngine on
6868
SSLCertificateFile {{ site.SSLCertificateFile }}
6969
{% if site.get('SSLCertificateKeyFile') %}SSLCertificateKeyFile {{ site.SSLCertificateKeyFile }}{% endif %}
70-
{% if site.get('SSLCertificateChainFile') %}SSLCertificateChainFile {{ site.SSLCertificateChainFile}}{% endif %}
70+
{% if site.get('SSLCertificateChainFile') %}SSLCertificateChainFile {{ site.SSLCertificateChainFile }}{% endif %}
7171
{% endif %}
72-
72+
7373
{% if site.get('Rewrite') %}RewriteEngine on
7474
{{ site.Rewrite }}
7575
{% endif %}
@@ -93,7 +93,7 @@
9393
<Directory "{{ path }}">
9494
{% if dvals.get('Options') != False %}Options {{ dvals.Options }}{% endif %}
9595
{% if map.version == '2.4' %}
96-
{% if dvals.get('Require') != False %}Require {{dvals.Require}}{% endif %}
96+
{% if dvals.get('Require') != False %}Require {{ dvals.Require }}{% endif %}
9797
{% else %}
9898
{% if dvals.get('Order') != False %}Order {{ dvals.Order }}{% endif %}
9999
{% if dvals.get('Allow') != False %}Allow {{ dvals.Allow }}{% endif %}
@@ -117,7 +117,7 @@
117117

118118
<Location "{{ path }}">
119119
{% if map.version == '2.4' %}
120-
{%- if lvals.get('Require') != False %}Require {{lvals.Require}}{% endif %}
120+
{%- if lvals.get('Require') != False %}Require {{ lvals.Require }}{% endif %}
121121
{% else %}
122122
{%- if lvals.get('Order') != False %}Order {{ lvals.Order }}{% endif %}
123123
{%- if lvals.get('Allow') != False %}Allow {{ lvals.Allow }}{% endif %}

0 commit comments

Comments
 (0)