From 87f09e4dca29dee8d942e8c27bc05d51eaaa72aa Mon Sep 17 00:00:00 2001 From: Richard Groux Date: Fri, 20 Sep 2024 18:06:33 +0200 Subject: [PATCH 1/2] feat(redhat): set NAMEDCONF file in sysconfig Add the possibility to set named config file into sysconfig default file --- bind/files/redhat/default | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bind/files/redhat/default b/bind/files/redhat/default index 40c7438b..2262eb25 100644 --- a/bind/files/redhat/default +++ b/bind/files/redhat/default @@ -6,4 +6,8 @@ # ROOTDIR="/var/named/chroot" # KEYTAB_FILE="/dir/file" # DISABLE_ZONE_CHECKING +{% set sysconfigfile = salt['pillar.get']('bind:lookup:config', False) -%} +{% if sysconfigfile -%} +NAMEDCONF={{ sysconfigfile }} +{% endif -%} OPTIONS="{{ param|join(' ') }}" From 68b8a46da34937bce1100d627aa14f1f1f199cb3 Mon Sep 17 00:00:00 2001 From: GROUX Richard Date: Wed, 30 Oct 2024 15:56:10 +0100 Subject: [PATCH 2/2] fix(CI): unset amazonlinux-2 and debian 9 in the test pipeline --- .gitlab-ci.yml | 4 ++-- .travis.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2094bee7..6ca8fc30 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -146,7 +146,7 @@ rubocop: # default-rockylinux-8-tiamat-py3: {extends: '.test_instance'} default-debian-11-master-py3: {extends: '.test_instance'} default-debian-10-master-py3: {extends: '.test_instance'} -default-debian-9-master-py3: {extends: '.test_instance'} +# default-debian-9-master-py3: {extends: '.test_instance'} default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'} default-ubuntu-2004-master-py3: {extends: '.test_instance'} default-ubuntu-1804-master-py3: {extends: '.test_instance'} @@ -156,7 +156,7 @@ default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'} default-fedora-35-master-py3: {extends: '.test_instance'} default-opensuse-leap-153-master-py3: {extends: '.test_instance'} # default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'} -default-amazonlinux-2-master-py3: {extends: '.test_instance'} +# default-amazonlinux-2-master-py3: {extends: '.test_instance'} # default-oraclelinux-8-master-py3: {extends: '.test_instance'} # default-oraclelinux-7-master-py3: {extends: '.test_instance'} # default-arch-base-latest-master-py3: {extends: '.test_instance'} diff --git a/.travis.yml b/.travis.yml index ca411da1..1272eb35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -109,7 +109,7 @@ jobs: # - env: INSTANCE=default-rockylinux-8-tiamat-py3 - env: INSTANCE=default-debian-11-master-py3 - env: INSTANCE=default-debian-10-master-py3 - - env: INSTANCE=default-debian-9-master-py3 + # - env: INSTANCE=default-debian-9-master-py3 - env: INSTANCE=default-ubuntu-2204-master-py3 - env: INSTANCE=default-ubuntu-2004-master-py3 - env: INSTANCE=default-ubuntu-1804-master-py3 @@ -119,7 +119,7 @@ jobs: - env: INSTANCE=default-fedora-35-master-py3 - env: INSTANCE=default-opensuse-leap-153-master-py3 # - env: INSTANCE=default-opensuse-tmbl-latest-master-py3 - - env: INSTANCE=default-amazonlinux-2-master-py3 + # - env: INSTANCE=default-amazonlinux-2-master-py3 # - env: INSTANCE=default-oraclelinux-8-master-py3 # - env: INSTANCE=default-oraclelinux-7-master-py3 # - env: INSTANCE=default-arch-base-latest-master-py3