Skip to content

Commit

Permalink
fix(map.jinja): fix salt-lint errors
Browse files Browse the repository at this point in the history
```bash
Examining apache/map.jinja of type state
[209] Jinja comment should have spaces before and after: {# comment #}
apache/map.jinja:22
{## Merge the apache pillar ##}
```
  • Loading branch information
myii committed Oct 17, 2019
1 parent 8465eb4 commit d011324
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions apache/map.jinja
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{# vi: set ft=jinja: #}
{#- vi: set ft=jinja: #}

{% import_yaml "apache/defaults.yaml" as default_settings %}
{% import_yaml "apache/osfamilymap.yaml" as osfamilymap %}
{% import_yaml "apache/oscodenamemap.yaml" as oscodenamemap %}
{% import_yaml "apache/osfingermap.yaml" as osfingermap %}
{% import_yaml "apache/modsecurity.yaml" as modsec %}
{%- import_yaml "apache/defaults.yaml" as default_settings %}
{%- import_yaml "apache/osfamilymap.yaml" as osfamilymap %}
{%- import_yaml "apache/oscodenamemap.yaml" as oscodenamemap %}
{%- import_yaml "apache/osfingermap.yaml" as osfingermap %}
{%- import_yaml "apache/modsecurity.yaml" as modsec %}

{% set defaults = salt['grains.filter_by'](default_settings,
{%- set defaults = salt['grains.filter_by'](default_settings,
default='apache',
merge=salt['grains.filter_by'](modsec, grain='os_family',
merge=salt['grains.filter_by'](osfamilymap, grain='os_family',
Expand All @@ -19,5 +19,5 @@
)
) %}

{## Merge the apache pillar ##}
{% set apache = salt['pillar.get']('apache', default=defaults, merge=True) %}
{#- Merge the apache pillar #}
{%- set apache = salt['pillar.get']('apache', default=defaults, merge=True) %}

0 comments on commit d011324

Please sign in to comment.