remove resovled settings from config when changed to undef

fixes #397
voxpupuli · Mar 11, 2024 · 8e4dead · 8e4dead
1 parent 51c0d2c
commit 8e4dead
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/manifests/resolved.pp b/manifests/resolved.pp
@@ -58,7 +58,7 @@
   Optional[Variant[Boolean,Enum['allow-downgrade']]] $dnssec         = $systemd::dnssec,
   Optional[Variant[Boolean,Enum['yes', 'opportunistic', 'no']]] $dnsovertls = $systemd::dnsovertls,
   Optional[Variant[Boolean,Enum['no-negative']]] $cache              = $systemd::cache,
-  Optional[Variant[Boolean,Enum['udp', 'tcp']]] $dns_stub_listener   = $systemd::dns_stub_listener,
+  Optional[Variant[Boolean,Enum['udp', 'tcp','absent']]] $dns_stub_listener   = $systemd::dns_stub_listener,
   Optional[Array[String[1]]] $dns_stub_listener_extra                = $systemd::dns_stub_listener_extra,
   Boolean $use_stub_resolver                                         = $systemd::use_stub_resolver,
 ) {
@@ -239,9 +239,9 @@
     default => $dns_stub_listener,
   }
 
-  if $_dns_stub_listener {
+  if  $dns_stub_listener =~ String[1] {
     ini_setting { 'dns_stub_listener':
-      ensure  => 'present',
+      ensure  => stdlib::ensure($dns_stub_listener != 'absent'),
       value   => $_dns_stub_listener,
       setting => 'DNSStubListener',
       section => 'Resolve',
@@ -250,9 +250,9 @@
     }
   }
 
-  if $dns_stub_listener_extra {
+  if $dns_stub_listener_extra =~ NotUndef {
     ini_setting { 'dns_stub_listener_extra':
-      ensure  => 'present',
+      ensure  => stdlib::ensure($dns_stub_listener_extra != 'absent'),
       value   => $dns_stub_listener_extra,
       setting => 'DNSStubListenerExtra',
       section => 'Resolve',

diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -112,7 +112,7 @@
           it { is_expected.not_to contain_ini_setting('dnssec') }
           it { is_expected.not_to contain_ini_setting('dnsovertls') }
           it { is_expected.not_to contain_ini_setting('cache') }
-          it { is_expected.not_to contain_ini_setting('dns_stub_listener') }
+          it { is_expected.to contain_ini_setting('dns_stub_listener').with_ensure('absent') }
         end
 
         context 'when enabling resolved with DNS values (array)' do
@@ -134,7 +134,7 @@
           it { is_expected.not_to contain_ini_setting('dnssec') }
           it { is_expected.not_to contain_ini_setting('dnsovertls') }
           it { is_expected.not_to contain_ini_setting('cache') }
-          it { is_expected.not_to contain_ini_setting('dns_stub_listener') }
+          it { is_expected.to contain_ini_setting('dns_stub_listener').with_ensure('absent') }
         end
 
         context 'when enabling resolved with DNS values (full)' do
@@ -171,8 +171,13 @@
             )
           }
 
-          it { is_expected.to contain_ini_setting('dns_stub_listener') }
-          it { is_expected.to contain_ini_setting('dns_stub_listener_extra').with_value(['192.0.2.1', '2001:db8::1']) }
+          it { is_expected.to contain_ini_setting('dns_stub_listener').with_ensure('present') }
+
+          it {
+            is_expected.to contain_ini_setting('dns_stub_listener_extra').
+              with_value(['192.0.2.1', '2001:db8::1']).
+              with_ensure('present')
+          }
         end
 
         context 'when enabling resolved with no-negative cache variant' do