From 44f612e17b64a0f2f888e14bf2473c3b7614885c Mon Sep 17 00:00:00 2001 From: Alexander Weidinger Date: Sat, 3 Apr 2021 13:34:28 +0200 Subject: [PATCH] feat(zones): define and compile zone files --- kitchen.yml | 1 + nsd/_test_dependencies.sls | 11 ++++ nsd/config/config_files.sls | 27 ++-------- nsd/config/init.sls | 1 + nsd/config/zones.sls | 51 +++++++++++++++++++ nsd/files/default/generated-zones.conf.jinja | 11 ++++ .../default/local-nsd-for-unbound.conf.jinja | 1 + .../default/zones/168.192.in-addr.arpa.zone | 20 ++++++++ nsd/files/default/zones/example.test.zone | 21 ++++++++ nsd/macros.jinja | 35 +++++++++++++ nsd/map.jinja | 3 +- nsd/parameters/defaults.yaml | 1 + nsd/parameters/os_family/FreeBSD.yaml | 1 + nsd/service/control-reload.sls | 23 +++++++++ nsd/service/control-setup.sls | 17 +++++++ nsd/service/init.sls | 2 + nsd/service/running.sls | 4 +- pillar.example | 11 ++++ test/integration/default/controls/services.rb | 36 +++++++++++++ .../default/files/_mapdata/amazonlinux-1.yaml | 6 +++ .../default/files/_mapdata/amazonlinux-2.yaml | 6 +++ .../files/_mapdata/arch-base-latest.yaml | 6 +++ .../default/files/_mapdata/centos-6.yaml | 6 +++ .../default/files/_mapdata/centos-7.yaml | 6 +++ .../default/files/_mapdata/centos-8.yaml | 6 +++ .../default/files/_mapdata/debian-10.yaml | 6 +++ .../default/files/_mapdata/debian-9.yaml | 6 +++ .../default/files/_mapdata/fedora-31.yaml | 6 +++ .../default/files/_mapdata/fedora-32.yaml | 6 +++ .../default/files/_mapdata/fedora-33.yaml | 6 +++ .../default/files/_mapdata/gentoo-2-sysd.yaml | 6 +++ .../default/files/_mapdata/gentoo-2-sysv.yaml | 6 +++ .../default/files/_mapdata/opensuse-15.yaml | 6 +++ .../files/_mapdata/opensuse-tumbleweed.yaml | 6 +++ .../default/files/_mapdata/oraclelinux-7.yaml | 6 +++ .../default/files/_mapdata/oraclelinux-8.yaml | 6 +++ .../default/files/_mapdata/ubuntu-16.yaml | 6 +++ .../default/files/_mapdata/ubuntu-18.yaml | 6 +++ .../default/files/_mapdata/ubuntu-20.yaml | 6 +++ 39 files changed, 369 insertions(+), 28 deletions(-) create mode 100644 nsd/_test_dependencies.sls create mode 100644 nsd/config/zones.sls create mode 100644 nsd/files/default/generated-zones.conf.jinja create mode 100644 nsd/files/default/zones/168.192.in-addr.arpa.zone create mode 100644 nsd/files/default/zones/example.test.zone create mode 100644 nsd/macros.jinja create mode 100644 nsd/service/control-reload.sls create mode 100644 nsd/service/control-setup.sls diff --git a/kitchen.yml b/kitchen.yml index 803a642..8faa09c 100644 --- a/kitchen.yml +++ b/kitchen.yml @@ -321,6 +321,7 @@ suites: state_top: base: '*': + - nsd._test_dependencies - nsd._mapdata - nsd pillars: diff --git a/nsd/_test_dependencies.sls b/nsd/_test_dependencies.sls new file mode 100644 index 0000000..500df4e --- /dev/null +++ b/nsd/_test_dependencies.sls @@ -0,0 +1,11 @@ +{%- if grains['os_family'] == 'RedHat' or grains['os_family'] == 'Suse' %} +{%- set package = 'bind-utils' %} +{%- elif grains['os_family'] == 'Arch' %} +{%- set package = 'bind-tools' %} +{%- else %} +{% set package = 'dnsutils' %} +{%- endif %} + +nsd-_test_dependencies--package--installed: + pkg.installed: + - name: {{ package }} diff --git a/nsd/config/config_files.sls b/nsd/config/config_files.sls index 51d0dad..d816b0e 100644 --- a/nsd/config/config_files.sls +++ b/nsd/config/config_files.sls @@ -6,29 +6,8 @@ {%- set sls_package_install = tplroot ~ '.package.install' %} {%- from tplroot ~ "/map.jinja" import mapdata as nsd with context %} {%- from tplroot ~ "/libtofs.jinja" import files_switch with context %} +{%- from tplroot ~ "/macros.jinja" import config_file with context %} {%- for name, template in nsd.get('config_files', {}).items() %} - -{%- set identifier = 'nsd-config-config_files-file-managed-'+name %} - -"{{ identifier }}": - file.managed: - - name: "{{ nsd.config_include_dir }}/{{ name }}.conf" - - source: {{ files_switch([template+'.conf', template+'.conf.jinja'], - lookup=identifier - ) - }} - - mode: 644 - - user: root - - group: {{ nsd.rootgroup }} - - makedirs: True - - template: jinja - - require: - - file: nsd-config-include-file-directory - - require_in: - - file: nsd-config-file-file-managed - - context: - nsd: {{ nsd | json }} - - check_cmd: nsd-checkconf - -{%- endfor %} +{{ config_file(name, template) }} +{% endfor %} diff --git a/nsd/config/init.sls b/nsd/config/init.sls index 29032d3..b768b95 100644 --- a/nsd/config/init.sls +++ b/nsd/config/init.sls @@ -5,3 +5,4 @@ include: - .include - .config_files - .file + - .zones diff --git a/nsd/config/zones.sls b/nsd/config/zones.sls new file mode 100644 index 0000000..6d5b0e4 --- /dev/null +++ b/nsd/config/zones.sls @@ -0,0 +1,51 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +{#- Get the `tplroot` from `tpldir` #} +{%- set tplroot = tpldir.split('/')[0] %} +{%- set sls_package_install = tplroot ~ '.package.install' %} +{%- from tplroot ~ "/map.jinja" import mapdata as nsd with context %} +{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %} +{%- from tplroot ~ "/macros.jinja" import config_file with context %} +{%- from tplroot ~ "/macros.jinja" import zonefile_name with context %} + +{%- set zones = nsd.get('zones', {}) %} + +{%- if zones | length > 0 %} + +{{ config_file('90-generated-zones', 'generated-zones') }} + +nsd-config-zones-file-directory: + file.directory: + - name: {{ nsd.zones_dir }} + - makedirs: True + +{%- for name, config in zones.items() %} + +{%- set identifier = 'nsd-config-zones-file-managed-'+name %} +{%- set template = 'zones/'+name+'.zone' %} + +"{{ identifier }}": + file.managed: + - name: "{{ nsd.zones_dir }}/{{ zonefile_name(name, config) }}" + - source: {{ files_switch([template, template+'.jinja'], + lookup=identifier + ) + }} + - mode: 644 + - user: root + - group: {{ nsd.rootgroup }} + - makedirs: True + - template: jinja + - context: + nsd: {{ nsd | json }} + - check_cmd: nsd-checkzone "{{ name }}" + - require: + - file: nsd-config-zones-file-directory + - require_in: + - service: nsd-service-running-service-running + - onchanges_in: + - cmd: nsd-service-control-reload-zones + +{%- endfor %} +{%- endif %} diff --git a/nsd/files/default/generated-zones.conf.jinja b/nsd/files/default/generated-zones.conf.jinja new file mode 100644 index 0000000..d993a5b --- /dev/null +++ b/nsd/files/default/generated-zones.conf.jinja @@ -0,0 +1,11 @@ +{%- from "nsd/macros.jinja" import zonefile_name with context -%} +######################################################################## +# File managed by Salt at <{{ source }}>. +# Your changes will be overwritten. +######################################################################## + +{%- for name, config in nsd.get('zones').items() %} +zone: + name: "{{ name }}" + zonefile: "{{ nsd.zones_dir }}/{{ zonefile_name(name, config) }}" +{%- endfor %} diff --git a/nsd/files/default/local-nsd-for-unbound.conf.jinja b/nsd/files/default/local-nsd-for-unbound.conf.jinja index f352ebb..1154266 100644 --- a/nsd/files/default/local-nsd-for-unbound.conf.jinja +++ b/nsd/files/default/local-nsd-for-unbound.conf.jinja @@ -15,4 +15,5 @@ server: port: 53530 remote-control: + control-enable: yes control-interface: 127.0.0.1 diff --git a/nsd/files/default/zones/168.192.in-addr.arpa.zone b/nsd/files/default/zones/168.192.in-addr.arpa.zone new file mode 100644 index 0000000..bf3d145 --- /dev/null +++ b/nsd/files/default/zones/168.192.in-addr.arpa.zone @@ -0,0 +1,20 @@ +$ORIGIN 168.192.in-addr.arpa. +$TTL 1800 +@ IN SOA ns1.example.test. admin.example.test. ( + 2021040101 ; serial number + 3600 ; refresh + 900 ; retry + 1209600 ; expire + 1800 ; ttl + ) +; Name servers + IN NS ns1.example.test. + IN NS ns2.example.test. + +; PTR records for name servers +1.0 IN PTR ns1.example.test. +2.0 IN PTR ns2.example.test. + +; Additional PTR records +10.0 IN PTR example.test. +11.0 IN PTR mail.example.test. diff --git a/nsd/files/default/zones/example.test.zone b/nsd/files/default/zones/example.test.zone new file mode 100644 index 0000000..34b73d5 --- /dev/null +++ b/nsd/files/default/zones/example.test.zone @@ -0,0 +1,21 @@ +$ORIGIN example.test. +$TTL 1800 +@ IN SOA ns1.example.test. admin.example.test. ( + 2021040101 ; serial number + 3600 ; refresh + 900 ; retry + 1209600 ; expire + 1800 ; ttl + ) +; Name servers + IN NS ns1.example.test. + IN NS ns2.example.test. + +; A records for name servers +ns1 IN A 192.168.0.1 +ns2 IN A 192.168.0.2 + +; Additional A records +@ IN A 192.168.0.10 +www IN CNAME example.test. +mail IN A 192.168.0.11 diff --git a/nsd/macros.jinja b/nsd/macros.jinja new file mode 100644 index 0000000..09f4c22 --- /dev/null +++ b/nsd/macros.jinja @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +{%- set tplroot = 'nsd' %} +{%- from tplroot ~ "/map.jinja" import mapdata as nsd with context %} +{%- from tplroot ~ "/libtofs.jinja" import files_switch with context %} + +{%- macro config_file(name, template) %} +{%- set identifier = 'nsd-config-config_file-file-managed-'+name %} +"{{ identifier }}": + file.managed: + - name: "{{ nsd.config_include_dir }}/{{ name }}.conf" + - source: {{ files_switch([template+'.conf', template+'.conf.jinja'], + lookup=identifier + ) + }} + - mode: 644 + - user: root + - group: {{ nsd.rootgroup }} + - makedirs: True + - template: jinja + - require: + - file: nsd-config-include-file-directory + - require_in: + - file: nsd-config-file-file-managed + - context: + nsd: {{ nsd | json }} + - check_cmd: nsd-checkconf + - watch_in: + - service: nsd-service-running-service-running +{%- endmacro %} + +{%- macro zonefile_name(zone_name, zone_config) -%} +{{ zone_config.get('zonefile', zone_name+'.zone') }} +{%- endmacro %} diff --git a/nsd/map.jinja b/nsd/map.jinja index 7340d53..02262a7 100644 --- a/nsd/map.jinja +++ b/nsd/map.jinja @@ -1,8 +1,7 @@ # -*- coding: utf-8 -*- # vim: ft=jinja -{#- Get the `tplroot` from `tpldir` #} -{%- set tplroot = tpldir.split("/")[0] %} +{%- set tplroot = 'nsd' %} {%- from tplroot ~ "/libmapstack.jinja" import mapstack %} {#- Where to lookup parameters source files #} diff --git a/nsd/parameters/defaults.yaml b/nsd/parameters/defaults.yaml index 93ab8ca..24bb98b 100644 --- a/nsd/parameters/defaults.yaml +++ b/nsd/parameters/defaults.yaml @@ -10,6 +10,7 @@ values: config: '/etc/nsd/nsd.conf' config_include_dir: '/etc/nsd/nsd.conf.d' config_include_glob: '*.conf' + zones_dir: '/etc/nsd/zones' service: name: nsd # Just here for testing diff --git a/nsd/parameters/os_family/FreeBSD.yaml b/nsd/parameters/os_family/FreeBSD.yaml index 591be57..5a6b02c 100644 --- a/nsd/parameters/os_family/FreeBSD.yaml +++ b/nsd/parameters/os_family/FreeBSD.yaml @@ -15,4 +15,5 @@ values: rootgroup: wheel config: '/usr/local/etc/nsd/nsd.conf' config_include_dir: '/usr/local/etc/nsd/nsd.conf.d' + zones_dir: '/usr/local/etc/nsd/zones' ... diff --git a/nsd/service/control-reload.sls b/nsd/service/control-reload.sls new file mode 100644 index 0000000..1e5882f --- /dev/null +++ b/nsd/service/control-reload.sls @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +{#- Get the `tplroot` from `tpldir` #} +{%- set tplroot = tpldir.split('/')[0] %} +{%- set sls_config_file = tplroot ~ '.config.file' %} +{%- set sls_service_running = tplroot ~ '.service.running' %} +{%- from tplroot ~ "/map.jinja" import mapdata as nsd with context %} + +{%- set config_dir = salt.file.dirname(nsd.config) %} + +include: + - {{ sls_config_file }} + - {{ sls_service_running }} + +nsd-service-control-reload-zones: + cmd.run: + - name: nsd-control reload + - onchanges: + - service: nsd-service-running-service-running + - require: + - service: nsd-service-running-service-running + - cmd: nsd-service-control-setup-control diff --git a/nsd/service/control-setup.sls b/nsd/service/control-setup.sls new file mode 100644 index 0000000..08fa5ea --- /dev/null +++ b/nsd/service/control-setup.sls @@ -0,0 +1,17 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +{#- Get the `tplroot` from `tpldir` #} +{%- set tplroot = tpldir.split('/')[0] %} +{%- set sls_config_file = tplroot ~ '.config.file' %} +{%- from tplroot ~ "/map.jinja" import mapdata as nsd with context %} + +{%- set config_dir = salt.file.dirname(nsd.config) %} + +include: + - {{ sls_config_file }} + +nsd-service-control-setup-control: + cmd.run: + - name: nsd-control-setup + - creates: {{ config_dir }}/nsd_server.pem diff --git a/nsd/service/init.sls b/nsd/service/init.sls index 6fe4d1a..acb9a97 100644 --- a/nsd/service/init.sls +++ b/nsd/service/init.sls @@ -2,4 +2,6 @@ # vim: ft=sls include: + - .control-setup - .running + - .control-reload diff --git a/nsd/service/running.sls b/nsd/service/running.sls index 0a5ec44..742da74 100644 --- a/nsd/service/running.sls +++ b/nsd/service/running.sls @@ -13,5 +13,5 @@ nsd-service-running-service-running: service.running: - name: {{ nsd.service.name }} - enable: True - - watch: - - sls: {{ sls_config_file }} + - require: + - cmd: nsd-service-control-setup-control diff --git a/pillar.example b/pillar.example index 802f7f2..f7ea0d1 100644 --- a/pillar.example +++ b/pillar.example @@ -19,6 +19,17 @@ nsd: # Configuration is separated into several files which have their own templates config_files: 10-server: local-nsd-for-unbound + # 90-generated-zones is reserved for zones generated by this formula + + # If this section is present in your Pillar data, + # nsd.conf.d/90-generated-zones will be created and managed. + zones: + example.test: + # Just for testing purpuses + multi-master-check: no + "168.192.in-addr.arpa": {} + # NSD's include-pattern directive may be a better way to share configuration + # across zones than using YAML anchors. tofs: # The files_switch key serves as a selector for alternative diff --git a/test/integration/default/controls/services.rb b/test/integration/default/controls/services.rb index 0cf22f4..feb8c81 100644 --- a/test/integration/default/controls/services.rb +++ b/test/integration/default/controls/services.rb @@ -20,4 +20,40 @@ control 'nsd.service.running' do it { should be_enabled } it { should be_running } end + + describe command('nslookup -port=53530 ns1.example.test 127.0.0.1') do + its('stdout') { should match "192.168.0.1" } + end + + describe command('nslookup -port=53530 ns2.example.test 127.0.0.1') do + its('stdout') { should match "192.168.0.2" } + end + + describe command('nslookup -port=53530 example.test 127.0.0.1') do + its('stdout') { should match "192.168.0.10" } + end + + describe command('nslookup -port=53530 www.example.test 127.0.0.1') do + its('stdout') { should match "192.168.0.10" } + end + + describe command('nslookup -port=53530 mail.example.test 127.0.0.1') do + its('stdout') { should match "192.168.0.11" } + end + + describe command('nslookup -port=53530 192.168.0.1 127.0.0.1') do + its('stdout') { should match "ns1.example.test" } + end + + describe command('nslookup -port=53530 192.168.0.2 127.0.0.1') do + its('stdout') { should match "ns2.example.test" } + end + + describe command('nslookup -port=53530 192.168.0.10 127.0.0.1') do + its('stdout') { should match "example.test" } + end + + describe command('nslookup -port=53530 192.168.0.11 127.0.0.1') do + its('stdout') { should match "mail.example.test" } + end end diff --git a/test/integration/default/files/_mapdata/amazonlinux-1.yaml b/test/integration/default/files/_mapdata/amazonlinux-1.yaml index f07a221..5a69913 100644 --- a/test/integration/default/files/_mapdata/amazonlinux-1.yaml +++ b/test/integration/default/files/_mapdata/amazonlinux-1.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/amazonlinux-2.yaml b/test/integration/default/files/_mapdata/amazonlinux-2.yaml index 3e92886..a732a9c 100644 --- a/test/integration/default/files/_mapdata/amazonlinux-2.yaml +++ b/test/integration/default/files/_mapdata/amazonlinux-2.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/arch-base-latest.yaml b/test/integration/default/files/_mapdata/arch-base-latest.yaml index 3f39a70..ab517e4 100644 --- a/test/integration/default/files/_mapdata/arch-base-latest.yaml +++ b/test/integration/default/files/_mapdata/arch-base-latest.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/centos-6.yaml b/test/integration/default/files/_mapdata/centos-6.yaml index 2c9394f..51a805a 100644 --- a/test/integration/default/files/_mapdata/centos-6.yaml +++ b/test/integration/default/files/_mapdata/centos-6.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/centos-7.yaml b/test/integration/default/files/_mapdata/centos-7.yaml index 64bb34e..a69b574 100644 --- a/test/integration/default/files/_mapdata/centos-7.yaml +++ b/test/integration/default/files/_mapdata/centos-7.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/centos-8.yaml b/test/integration/default/files/_mapdata/centos-8.yaml index 85c3dcc..919bd1d 100644 --- a/test/integration/default/files/_mapdata/centos-8.yaml +++ b/test/integration/default/files/_mapdata/centos-8.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/debian-10.yaml b/test/integration/default/files/_mapdata/debian-10.yaml index 977f934..638f05a 100644 --- a/test/integration/default/files/_mapdata/debian-10.yaml +++ b/test/integration/default/files/_mapdata/debian-10.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/debian-9.yaml b/test/integration/default/files/_mapdata/debian-9.yaml index c720c50..f914738 100644 --- a/test/integration/default/files/_mapdata/debian-9.yaml +++ b/test/integration/default/files/_mapdata/debian-9.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/fedora-31.yaml b/test/integration/default/files/_mapdata/fedora-31.yaml index 86436dd..8d25ff9 100644 --- a/test/integration/default/files/_mapdata/fedora-31.yaml +++ b/test/integration/default/files/_mapdata/fedora-31.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/fedora-32.yaml b/test/integration/default/files/_mapdata/fedora-32.yaml index d152d44..199a40b 100644 --- a/test/integration/default/files/_mapdata/fedora-32.yaml +++ b/test/integration/default/files/_mapdata/fedora-32.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/fedora-33.yaml b/test/integration/default/files/_mapdata/fedora-33.yaml index 9915475..6cb4a6d 100644 --- a/test/integration/default/files/_mapdata/fedora-33.yaml +++ b/test/integration/default/files/_mapdata/fedora-33.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml index 754c05e..c4295a2 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml index 754c05e..c4295a2 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/opensuse-15.yaml b/test/integration/default/files/_mapdata/opensuse-15.yaml index 61597cb..0a28fbd 100644 --- a/test/integration/default/files/_mapdata/opensuse-15.yaml +++ b/test/integration/default/files/_mapdata/opensuse-15.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml index 6d98ed0..827e149 100644 --- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml +++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/oraclelinux-7.yaml b/test/integration/default/files/_mapdata/oraclelinux-7.yaml index f7ab208..b3cba23 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-7.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-7.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/oraclelinux-8.yaml b/test/integration/default/files/_mapdata/oraclelinux-8.yaml index febbbb2..e925080 100644 --- a/test/integration/default/files/_mapdata/oraclelinux-8.yaml +++ b/test/integration/default/files/_mapdata/oraclelinux-8.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/ubuntu-16.yaml b/test/integration/default/files/_mapdata/ubuntu-16.yaml index 260e1e2..004eeeb 100644 --- a/test/integration/default/files/_mapdata/ubuntu-16.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-16.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/ubuntu-18.yaml b/test/integration/default/files/_mapdata/ubuntu-18.yaml index 2b037f0..8bf5de1 100644 --- a/test/integration/default/files/_mapdata/ubuntu-18.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-18.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" + diff --git a/test/integration/default/files/_mapdata/ubuntu-20.yaml b/test/integration/default/files/_mapdata/ubuntu-20.yaml index bbc0d27..dd5cba9 100644 --- a/test/integration/default/files/_mapdata/ubuntu-20.yaml +++ b/test/integration/default/files/_mapdata/ubuntu-20.yaml @@ -42,3 +42,9 @@ values: nsd-config-file-file-managed: - nsd.conf.jinja winner: pillar + zones: + 168.192.in-addr.arpa: {} + example.test: + multi-master-check: false + zones_dir: "/etc/nsd/zones" +