Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(semantic-release): implement for this formula #270

Merged
merged 20 commits into from
Oct 20, 2019
Merged

feat(semantic-release): implement for this formula #270

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
34d1f7c
feat(semantic-release): implement for this formula
myii Oct 17, 2019
68b971b
test(mod_security_spec): convert from Serverspec to InSpec
myii Oct 17, 2019
97f6ead
fix(yamllint): fix all errors
myii Oct 17, 2019
f4045ef
fix(apache-2.2.config.jinja): fix `salt-lint` errors
myii Oct 17, 2019
e2c1c2e
fix(apache-2.4.config.jinja): fix `salt-lint` errors
myii Oct 17, 2019
2a79d05
fix(modsecurity.conf.jinja): fix `salt-lint` errors
myii Oct 17, 2019
a146c59
fix(flags.sls): fix `salt-lint` errors
myii Oct 17, 2019
8465eb4
fix(init.sls): fix `salt-lint` errors
myii Oct 17, 2019
d011324
fix(map.jinja): fix `salt-lint` errors
myii Oct 17, 2019
e55ef9b
fix(mod_geoip.sls): fix `salt-lint` errors
myii Oct 17, 2019
55d11f8
fix(modules.sls): fix `salt-lint` errors
myii Oct 17, 2019
da9a592
fix(server_status.sls): fix `salt-lint` errors
myii Oct 17, 2019
ed7dc7b
fix(uninstall.sls): fix `salt-lint` errors
myii Oct 17, 2019
b0bbd0b
fix(vhosts/cleanup.sls): fix `salt-lint` errors
myii Oct 17, 2019
146dc67
fix(vhosts/minimal.tmpl): fix `salt-lint` errors
myii Oct 17, 2019
e7c9fbb
fix(vhosts/proxy.tmpl): fix `salt-lint` errors
myii Oct 17, 2019
0a41b19
fix(vhosts/redirect.tmpl): fix `salt-lint` errors
myii Oct 17, 2019
1bad58d
fix(vhosts/standard.tmpl): fix `salt-lint` errors
myii Oct 17, 2019
701929d
docs(formula): use standard structure
myii Oct 17, 2019
6933f0e
docs(readme): move to `docs/` directory and modify accordingly
myii Oct 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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 %}
```
  • Loading branch information
@myii
myii committed Oct 17, 2019
commit e7c9fbb152f3ba9610c875ebae3a6f42eb09a69c
8 changes: 4 additions & 4 deletions apache/vhosts/proxy.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
'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 }}
{% if site.get('ServerAlias') != False %}ServerAlias {{ vals.ServerAlias }}{% endif %}
{% if site.get('ServerAdmin') != False %}ServerAdmin {{ vals.ServerAdmin }}{% endif %}
Expand All @@ -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 }}
Expand Down Expand Up @@ -82,7 +82,7 @@
} %}
<Location "{{ path }}">
{% 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 %}
Expand All @@ -99,7 +99,7 @@
} %}
<LocationMatch "{{ regpath }}">
{% 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 %}
Expand Down