Commit 36f16697 authored by nimrod's avatar nimrod
Browse files

- Added server block to nsd.conf. 

- Corrected names of config options under nsd_config.
- Corrected tests for newer version of Molecule.
parent 7aee504c

defaults/main.yml

+2 −2
Original line number Diff line number Diff line
@@ -4,5 +4,5 @@ 
nsd_mail_alias: root # Where to send mail for the NSD user.

nsd_config: # key/value configuration under the server block, for more

            # information consult the nsd.conf man page.

    nsd_ratelimit_qps: 200

    nsd_whitelist_ratelimit_qps: 2000
 
    'rrl-ratelimit': 200

    'rrl-whitelist-ratelimit': 2000

tasks/main.yml

+8 −0
Original line number Diff line number Diff line
@@ -25,10 +25,18 @@ 
  lineinfile:

      dest: '{{ nsd_conf }}'

      line: 'include: "{{ nsd_conf_d }}/*.conf"'

      insertafter: EOF

      state: present

  notify:

      - Restart NSD



- name: Add server block

  lineinfile:

      dest: '{{ nsd_conf }}'

      line: 'server:'

      insertbefore: BOF

      state: present



- name: Configure

  with_dict: '{{ nsd_config }}'

  lineinfile:

tests/test_nsd.py

+14 −11
Original line number Diff line number Diff line 
def test_nsd(Command, Service, Ansible):

def test_nsd(Command, Sudo):

    with Sudo():

        assert Command('nsd -v').rc == 0





def test_nsd_service(Service):

def test_nsd_service(Service, Sudo):

    service = Service('nsd')

    with Sudo():

        assert service.is_running

        try:

            assert service.is_enabled
@@ -18,9 +20,10 @@ def test_nsd_config(Command, File, Ansible): 
        assert Command('nsd-checkconf /etc/nsd/nsd.conf')





def test_nsd_directories(File, Ansible):

def test_nsd_directories(File, Ansible, Sudo):

    ansible_os_family = Ansible('setup')['ansible_facts']['ansible_os_family']

    if ansible_os_family == 'OpenBSD':

        with Sudo():

            assert File('/var/nsd/etc/nsd.conf.d').is_directory

            assert File('/var/nsd/zones').is_directory

    elif ansible_os_family == 'Debian':