Skip to content

Commit 920615a

Browse files
committed
fix(config.sls): fix salt-lint errors
```bash Examining bind/config.sls of type state [204] Lines should be no longer that 160 chars bind/config.sls:217 {%- do generate_reverse(zone_records, salt['pillar.get']('bind:available_zones:' + zone + ':generate_reverse:net'), salt['pillar.get']('bind:available_zones:' + zone + ':generate_reverse:for_zones'), salt['pillar.get']('bind:available_zones', {})) %} [206] Jinja variables should have spaces before and after: {{ var_name }} bind/config.sls:225 zones{{ dash_view }}-{{ zone }}{{ '.include' if serial_auto else ''}}: [206] Jinja variables should have spaces before and after: {{ var_name }} bind/config.sls:227 - name: {{ zones_directory }}/{{ file }}{{ '.include' if serial_auto else ''}} [206] Jinja variables should have spaces before and after: {{ var_name }} bind/config.sls:295 - unless: "grep {{ key_flags.zsk }} {{ key_directory }}/K{{zone}}.+{{ key_algorithm_field }}+*.key" [206] Jinja variables should have spaces before and after: {{ var_name }} bind/config.sls:304 - unless: "grep {{ key_flags.ksk }} {{ key_directory }}/K{{zone}}.+{{ key_algorithm_field }}+*.key" ```
1 parent 7a356e3 commit 920615a

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

bind/config.sls

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,17 +214,22 @@ bind_rndc_client_config:
214214
{%- endif %}
215215
{%- set zone_records = salt['pillar.get']('bind:available_zones:' + zone + ':records', {}) %}
216216
{%- if salt['pillar.get']('bind:available_zones:' + zone + ':generate_reverse') %}
217-
{%- do generate_reverse(zone_records, salt['pillar.get']('bind:available_zones:' + zone + ':generate_reverse:net'), salt['pillar.get']('bind:available_zones:' + zone + ':generate_reverse:for_zones'), salt['pillar.get']('bind:available_zones', {})) %}
217+
{%- do generate_reverse(
218+
zone_records,
219+
salt['pillar.get']('bind:available_zones:' + zone + ':generate_reverse:net'),
220+
salt['pillar.get']('bind:available_zones:' + zone + ':generate_reverse:for_zones'),
221+
salt['pillar.get']('bind:available_zones', {})
222+
) %}
218223
{%- endif %}
219224
{# If we define RRs in pillar, we use the internal template to generate the zone file
220225
otherwise, we fallback to the old behaviour and use the declared file
221226
#}
222227
{%- set zone_source = 'salt://bind/files/zone.jinja' if zone_records != {} else 'salt://' ~ map.zones_source_dir ~ '/' ~ file %}
223228
{%- set serial_auto = salt['pillar.get']('bind:available_zones:' + zone + ':soa:serial', '') == 'auto' %}
224229
{% if file and zone_data['type'] == 'master' -%}
225-
zones{{ dash_view }}-{{ zone }}{{ '.include' if serial_auto else ''}}:
230+
zones{{ dash_view }}-{{ zone }}{{ '.include' if serial_auto else '' }}:
226231
file.managed:
227-
- name: {{ zones_directory }}/{{ file }}{{ '.include' if serial_auto else ''}}
232+
- name: {{ zones_directory }}/{{ file }}{{ '.include' if serial_auto else '' }}
228233
- source: {{ zone_source }}
229234
- template: jinja
230235
{% if zone_records != {} %}
@@ -292,7 +297,7 @@ zsk-{{ zone }}:
292297
- cwd: {{ key_directory }}
293298
- name: dnssec-keygen -a {{ key_algorithm }} -b {{ key_size }} -n ZONE {{ zone }}
294299
- runas: {{ map.user }}
295-
- unless: "grep {{ key_flags.zsk }} {{ key_directory }}/K{{zone}}.+{{ key_algorithm_field }}+*.key"
300+
- unless: "grep {{ key_flags.zsk }} {{ key_directory }}/K{{ zone }}.+{{ key_algorithm_field }}+*.key"
296301
- require:
297302
- file: bind_key_directory
298303
@@ -301,7 +306,7 @@ ksk-{{ zone }}:
301306
- cwd: {{ key_directory }}
302307
- name: dnssec-keygen -f KSK -a {{ key_algorithm }} -b {{ key_size }} -n ZONE {{ zone }}
303308
- runas: {{ map.user }}
304-
- unless: "grep {{ key_flags.ksk }} {{ key_directory }}/K{{zone}}.+{{ key_algorithm_field }}+*.key"
309+
- unless: "grep {{ key_flags.ksk }} {{ key_directory }}/K{{ zone }}.+{{ key_algorithm_field }}+*.key"
305310
- require:
306311
- file: bind_key_directory
307312
{% endif %}

0 commit comments

Comments
 (0)