Browse Source

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
<VirtualHost {%- for intf in vals.interfaces %} {{intf}}:{{ vals.port }}{% endfor -%}>

[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 %}
```
tags/v0.38.0
Imran Iqbal 5 years ago
parent
commit
e7c9fbb152
No account linked to committer's email address
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      apache/vhosts/proxy.tmpl

+ 4
- 4
apache/vhosts/proxy.tmpl View File

'Require': 'all granted', 'Require': 'all granted',
}, },
} %} } %}
<VirtualHost {%- for intf in vals.interfaces %} {{intf}}:{{ vals.port }}{% endfor -%}>
<VirtualHost {%- for intf in vals.interfaces %} {{ intf }}:{{ vals.port }}{% endfor -%}>
ServerName {{ vals.ServerName }} ServerName {{ vals.ServerName }}
{% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %} {% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %}
{% if site.get('ServerAdmin') != False %}ServerAdmin {{ vals.ServerAdmin }}{% endif %} {% if site.get('ServerAdmin') != False %}ServerAdmin {{ vals.ServerAdmin }}{% endif %}
{% if site.get('SSLCertificateFile') %}SSLEngine on {% if site.get('SSLCertificateFile') %}SSLEngine on
SSLCertificateFile {{ site.SSLCertificateFile }} SSLCertificateFile {{ site.SSLCertificateFile }}
{% if site.get('SSLCertificateKeyFile') %}SSLCertificateKeyFile {{ site.SSLCertificateKeyFile }}{% endif %} {% 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 %} {% endif %}
{% if site.get('Rewrite') %}RewriteEngine on {% if site.get('Rewrite') %}RewriteEngine on
{{ site.Rewrite }} {{ site.Rewrite }}
} %} } %}
<Location "{{ path }}"> <Location "{{ path }}">
{% if apache.version == '2.4' %} {% if apache.version == '2.4' %}
{%- if lvals.get('Require') != False %}Require {{lvals.Require}}{% endif %}
{%- if lvals.get('Require') != False %}Require {{ lvals.Require }}{% endif %}
{% else %} {% else %}
{%- if lvals.get('Order') != False %}Order {{ lvals.Order }}{% endif %} {%- if lvals.get('Order') != False %}Order {{ lvals.Order }}{% endif %}
{%- if lvals.get('Allow') != False %}Allow {{ lvals.Allow }}{% endif %} {%- if lvals.get('Allow') != False %}Allow {{ lvals.Allow }}{% endif %}
} %} } %}
<LocationMatch "{{ regpath }}"> <LocationMatch "{{ regpath }}">
{% if apache.version == '2.4' %} {% if apache.version == '2.4' %}
{%- if lmvals.get('Require') != False %}Require {{lmvals.Require}}{% endif %}
{%- if lmvals.get('Require') != False %}Require {{ lmvals.Require }}{% endif %}
{% else %} {% else %}
{%- if lmvals.get('Order') != False %}Order {{ lmvals.Order }}{% endif %} {%- if lmvals.get('Order') != False %}Order {{ lmvals.Order }}{% endif %}
{%- if lmvals.get('Allow') != False %}Allow {{ lmvals.Allow }}{% endif %} {%- if lmvals.get('Allow') != False %}Allow {{ lmvals.Allow }}{% endif %}

Loading…
Cancel
Save