Merge pull request #93 from npmdnl/npmdnl-rm-eol

Removed EOL versions

.github/workflows/main.yml

@@ -10,15 +10,14 @@ jobs:
     strategy:
       matrix:
         ansible:
-          - '2.9'
-          - '2.10'
           - '2.11'
+          - '2.12'
+          - '2.13'
         scenario:
-          - pdns-rec-43
-          - pdns-rec-44
-          - pdns-rec-45
+          - pdns-rec-46
+          - pdns-rec-47
+          - pdns-rec-48
           - pdns-rec-master
-          - pdns-rec-43-no-sd-overrides
     steps:
       - name: checkout
         uses: actions/checkout@v3

README.md

@@ -32,23 +32,23 @@ By default, the PowerDNS Recursor is installed from the software repositories co
   - { role: PowerDNS.pdns_recursor,
       pdns_rec_install_repo: "{{ pdns_rec_powerdns_repo_master }}" }
 
-# Install the PowerDNS Recursor from the '4.3.x' official repository
+# Install the PowerDNS Recursor from the '4.6.x' official repository
 - hosts: pdns-recursors
   roles:
   - { role: PowerDNS.pdns_recursor,
-      pdns_rec_install_repo: "{{ pdns_rec_powerdns_repo_43 }}" }
+      pdns_rec_install_repo: "{{ pdns_rec_powerdns_repo_46 }}" }
 
-# Install the PowerDNS Recursor from the '4.4.x' official repository
+# Install the PowerDNS Recursor from the '4.7.x' official repository
 - hosts: pdns-recursors
   roles:
   - { role: PowerDNS.pdns_recursor,
-      pdns_rec_install_repo: "{{ pdns_rec_powerdns_repo_44 }}" }
+      pdns_rec_install_repo: "{{ pdns_rec_powerdns_repo_47 }}" }
 
-# Install the PowerDNS Recursor from the '4.5.x' official repository
+# Install the PowerDNS Recursor from the '4.8.x' official repository
 - hosts: pdns-recursors
   roles:
   - { role: PowerDNS.pdns_recursor,
-      pdns_rec_install_repo: "{{ pdns_rec_powerdns_repo_45 }}" }
+      pdns_rec_install_repo: "{{ pdns_rec_powerdns_repo_48 }}" }
 ```
 
 The examples above, show how to install the PowerDNS Recursor from the official PowerDNS repositories
@@ -258,7 +258,7 @@ To test all the scenarios run
 
 To run a custom molecule command
 
-    $ tox -e ansible210 -- molecule test -s pdns-rec-45
+    $ tox -e ansible210 -- molecule test -s pdns-rec-48
 
 ## License
 

molecule/pdns-rec-44/converge.yml → molecule/pdns-rec-46/converge.yml

@@ -3,6 +3,6 @@
 - hosts: all
   vars_files:
     - ../resources/vars/pdns-rec-common.yml
-    - ../resources/vars/pdns-rec-repo-44.yml
+    - ../resources/vars/pdns-rec-repo-46.yml
   roles:
     - { role: pdns_recursor-ansible }

molecule/pdns-rec-45/molecule.yml → molecule/pdns-rec-46/molecule.yml

@@ -1,7 +1,7 @@
 ---
 
 scenario:
-  name: pdns-rec-45
+  name: pdns-rec-46
 
 driver:
   name: docker
@@ -62,6 +62,6 @@ verifier:
     vvv: True
   directory: ../resources/tests/all
   additional_files_or_dirs:
-    - ../repo-45/
+    - ../repo-46/
     - ../systemd-overrides
   lint: flake8

molecule/pdns-rec-43/converge.yml → molecule/pdns-rec-47/converge.yml

@@ -3,6 +3,6 @@
 - hosts: all
   vars_files:
     - ../resources/vars/pdns-rec-common.yml
-    - ../resources/vars/pdns-rec-repo-43.yml
+    - ../resources/vars/pdns-rec-repo-47.yml
   roles:
     - { role: pdns_recursor-ansible }

molecule/pdns-rec-43/molecule.yml → molecule/pdns-rec-47/molecule.yml

@@ -1,7 +1,7 @@
 ---
 
 scenario:
-  name: pdns-rec-43
+  name: pdns-rec-47
 
 driver:
   name: docker
@@ -18,12 +18,12 @@ platforms:
     image: oraclelinux:8
     dockerfile_tpl: centos-systemd
 
-  - name: ubuntu-2004
-    image: ubuntu:20.04
+  - name: ubuntu-1804
+    image: ubuntu:18.04
     dockerfile_tpl: debian-systemd
 
-  - name: debian-9
-    image: debian:9
+  - name: ubuntu-2004
+    image: ubuntu:20.04
     dockerfile_tpl: debian-systemd
 
   - name: debian-10
@@ -62,6 +62,6 @@ verifier:
     vvv: True
   directory: ../resources/tests/all
   additional_files_or_dirs:
-    - ../repo-43/
+    - ../repo-47/
     - ../systemd-overrides
   lint: flake8

molecule/pdns-rec-45/converge.yml → molecule/pdns-rec-48/converge.yml

@@ -3,6 +3,6 @@
 - hosts: all
   vars_files:
     - ../resources/vars/pdns-rec-common.yml
-    - ../resources/vars/pdns-rec-repo-45.yml
+    - ../resources/vars/pdns-rec-repo-48.yml
   roles:
     - { role: pdns_recursor-ansible }

molecule/pdns-rec-44/molecule.yml → molecule/pdns-rec-48/molecule.yml

@@ -1,7 +1,7 @@
 ---
 
 scenario:
-  name: pdns-rec-44
+  name: pdns-rec-48
 
 driver:
   name: docker
@@ -26,10 +26,6 @@ platforms:
     image: ubuntu:20.04
     dockerfile_tpl: debian-systemd
 
-  - name: debian-9
-    image: debian:9
-    dockerfile_tpl: debian-systemd
-
   - name: debian-10
     image: debian:10
     dockerfile_tpl: debian-systemd
@@ -66,6 +62,6 @@ verifier:
     vvv: True
   directory: ../resources/tests/all
   additional_files_or_dirs:
-    - ../repo-44/
+    - ../repo-48/
     - ../systemd-overrides
   lint: flake8

molecule/resources/tests/repo-45/test_repo_45.py → molecule/resources/tests/repo-46/test_repo_46.py

@@ -6,9 +6,9 @@
 def test_repo_file(host):
     f = None
     if host.system_info.distribution.lower() in debian_os:
-        f = host.file('/etc/apt/sources.list.d/powerdns-rec-45.list')
+        f = host.file('/etc/apt/sources.list.d/powerdns-rec-46.list')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-rec-45.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-rec-46.repo')
 
     assert f.exists
     assert f.user == 'root'
@@ -18,19 +18,19 @@ def test_repo_file(host):
 def test_pdns_repo(host):
     f = None
     if host.system_info.distribution.lower() in debian_os:
-        f = host.file('/etc/apt/sources.list.d/powerdns-rec-45.list')
+        f = host.file('/etc/apt/sources.list.d/powerdns-rec-46.list')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-rec-45.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-rec-46.repo')
 
     assert f.exists
-    assert f.contains('rec-45')
+    assert f.contains('rec-46')
 
 
 def test_pdns_version(host):
     cmd = host.run('/usr/sbin/pdns_recursor --version')
 
     assert 'PowerDNS Recursor' in cmd.stderr
-    assert '4.5' in cmd.stderr
+    assert '4.6' in cmd.stderr
 
 
 def systemd_override(host):

molecule/resources/tests/repo-44/test_repo_44.py → molecule/resources/tests/repo-47/test_repo_47.py

@@ -6,9 +6,9 @@
 def test_repo_file(host):
     f = None
     if host.system_info.distribution.lower() in debian_os:
-        f = host.file('/etc/apt/sources.list.d/powerdns-rec-44.list')
+        f = host.file('/etc/apt/sources.list.d/powerdns-rec-47.list')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-rec-44.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-rec-47.repo')
 
     assert f.exists
     assert f.user == 'root'
@@ -18,24 +18,24 @@ def test_repo_file(host):
 def test_pdns_repo(host):
     f = None
     if host.system_info.distribution.lower() in debian_os:
-        f = host.file('/etc/apt/sources.list.d/powerdns-rec-44.list')
+        f = host.file('/etc/apt/sources.list.d/powerdns-rec-47.list')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-rec-44.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-rec-47.repo')
 
     assert f.exists
-    assert f.contains('rec-44')
+    assert f.contains('rec-47')
 
 
 def test_pdns_version(host):
     cmd = host.run('/usr/sbin/pdns_recursor --version')
 
     assert 'PowerDNS Recursor' in cmd.stderr
-    assert '4.4' in cmd.stderr
+    assert '4.7' in cmd.stderr
 
 
 def systemd_override(host):
     fname = '/etc/systemd/system/pdns-recursor.service.d/override.conf'
     f = host.file(fname)
 
-    assert f.contains('User=')
-    assert f.contains('Group=')
+    assert not f.contains('User=')
+    assert not f.contains('Group=')

molecule/resources/tests/repo-43/test_repo_43.py → molecule/resources/tests/repo-48/test_repo_48.py

@@ -6,9 +6,9 @@
 def test_repo_file(host):
     f = None
     if host.system_info.distribution.lower() in debian_os:
-        f = host.file('/etc/apt/sources.list.d/powerdns-rec-43.list')
+        f = host.file('/etc/apt/sources.list.d/powerdns-rec-48.list')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-rec-43.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-rec-48.repo')
 
     assert f.exists
     assert f.user == 'root'
@@ -18,24 +18,24 @@ def test_repo_file(host):
 def test_pdns_repo(host):
     f = None
     if host.system_info.distribution.lower() in debian_os:
-        f = host.file('/etc/apt/sources.list.d/powerdns-rec-43.list')
+        f = host.file('/etc/apt/sources.list.d/powerdns-rec-48.list')
     if host.system_info.distribution.lower() in rhel_os:
-        f = host.file('/etc/yum.repos.d/powerdns-rec-43.repo')
+        f = host.file('/etc/yum.repos.d/powerdns-rec-48.repo')
 
     assert f.exists
-    assert f.contains('rec-43')
+    assert f.contains('rec-48')
 
 
 def test_pdns_version(host):
     cmd = host.run('/usr/sbin/pdns_recursor --version')
 
     assert 'PowerDNS Recursor' in cmd.stderr
-    assert '4.3' in cmd.stderr
+    assert '4.8' in cmd.stderr
 
 
 def systemd_override(host):
     fname = '/etc/systemd/system/pdns-recursor.service.d/override.conf'
     f = host.file(fname)
 
-    assert f.contains('User=')
-    assert f.contains('Group=')
+    assert not f.contains('User=')
+    assert not f.contains('Group=')

molecule/resources/vars/pdns-rec-repo-46.yml

@@ -0,0 +1,7 @@
+---
+
+##
+# PowerDNS Recursor 4.6.x Repository
+##
+
+pdns_rec_install_repo: "{{ pdns_rec_powerdns_repo_46 }}"