Просмотр исходного кода

fix(map.jinja): fix `salt-lint` errors

```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 ##}
```
tags/v0.38.0
Imran Iqbal 5 лет назад
Родитель
Сommit
d011324bd2
Аккаунт пользователя с таким Email не найден
1 измененных файлов: 9 добавлений и 9 удалений
  1. +9
    -9
      apache/map.jinja

+ 9
- 9
apache/map.jinja Просмотреть файл

{# 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', default='apache',
merge=salt['grains.filter_by'](modsec, grain='os_family', merge=salt['grains.filter_by'](modsec, grain='os_family',
merge=salt['grains.filter_by'](osfamilymap, grain='os_family', merge=salt['grains.filter_by'](osfamilymap, grain='os_family',
) )
) %} ) %}


{## 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) %}

Загрузка…
Отмена
Сохранить