Skip to content

Commit

Permalink
fix(named.conf.logging.jinja): fix salt-lint errors
Browse files Browse the repository at this point in the history
```bash
Examining bind/files/named.conf.logging.jinja of type state
[206] Jinja variables should have spaces before and after: {{ var_name }}
bind/files/named.conf.logging.jinja:6
        channel {{channel}} {

[201] Trailing whitespace
bind/files/named.conf.logging.jinja:8
                file "{{ map.log_dir }}/{{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':file')}}" versions {{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':versions', '3')}} size {{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':size', '20m')}};

[204] Lines should be no longer that 160 chars
bind/files/named.conf.logging.jinja:8
                file "{{ map.log_dir }}/{{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':file')}}" versions {{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':versions', '3')}} size {{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':size', '20m')}};

[206] Jinja variables should have spaces before and after: {{ var_name }}
bind/files/named.conf.logging.jinja:8
                file "{{ map.log_dir }}/{{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':file')}}" versions {{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':versions', '3')}} size {{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':size', '20m')}};

[206] Jinja variables should have spaces before and after: {{ var_name }}
bind/files/named.conf.logging.jinja:20
                severity {{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':severity')}};

[206] Jinja variables should have spaces before and after: {{ var_name }}
bind/files/named.conf.logging.jinja:23
                syslog {{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':syslog')}};

[206] Jinja variables should have spaces before and after: {{ var_name }}
bind/files/named.conf.logging.jinja:29
        category {{category}} { {{ salt['pillar.get']('bind:config:use_extensive_logging:category:'+category, []) | join('; ') }}; };
```
  • Loading branch information
myii committed Oct 9, 2019
1 parent 67736a2 commit f220886
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions bind/files/named.conf.logging.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
logging {

{% for channel in salt['pillar.get']('bind:config:use_extensive_logging:channel') %}
channel {{channel}} {
channel {{ channel }} {
{%- if salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':file', False) %}
file "{{ map.log_dir }}/{{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':file')}}" versions {{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':versions', '3')}} size {{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':size', '20m')}};
{%- set channel_file = salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':file') %}
{%- set channel_versions = salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':versions', '3') %}
{%- set channel_size = salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':size', '20m') %}
file "{{ map.log_dir }}/{{ channel_file }}" versions {{ channel_versions }} size {{ channel_size }};
{%- endif %}
{%- if salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':print-time') %}
print-time yes;
Expand All @@ -17,16 +20,16 @@ logging {
print-severity yes;
{%- endif %}
{%- if salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':severity') %}
severity {{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':severity')}};
severity {{ salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':severity') }};
{%- endif %}
{%- if salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':syslog') %}
syslog {{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':syslog')}};
syslog {{ salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':syslog') }};
{%- endif %}
};
{% endfor %}

{%- for category in salt['pillar.get']('bind:config:use_extensive_logging:category') %}
category {{category}} { {{ salt['pillar.get']('bind:config:use_extensive_logging:category:'+category, []) | join('; ') }}; };
category {{ category }} { {{ salt['pillar.get']('bind:config:use_extensive_logging:category:'+category, []) | join('; ') }}; };

{%- endfor %}

Expand Down

0 comments on commit f220886

Please sign in to comment.