From 1fd3beebae97fed7db732ddb33bb0ebad070ee09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Malmstr=C3=B6m?= Date: Tue, 24 Mar 2026 16:41:00 +0000 Subject: [PATCH 1/6] Update observer.default.erb DHB26 is IPv4 only. --- modules/observer/templates/observer.default.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/observer/templates/observer.default.erb b/modules/observer/templates/observer.default.erb index be4862e2..c6b746f5 100644 --- a/modules/observer/templates/observer.default.erb +++ b/modules/observer/templates/observer.default.erb @@ -1,4 +1,4 @@ # AUTOGENERATED BY PUPPET # All manual changes will be overwritten -ARGS="-dns <%= @nameservers.join(',') -%> -icmp-targets <%= @icmp_target %> -qname <%= @dns_target %> -interface <%= @interface %>" +ARGS="-dns -disable6 <%= @nameservers.join(',') -%> -icmp-targets <%= @icmp_target %> -qname <%= @dns_target %> -interface <%= @interface %>" From 2b3c62814940c136ea4c81e68f164e6a534d9323 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Malmstr=C3=B6m?= Date: Tue, 24 Mar 2026 17:24:38 +0000 Subject: [PATCH 2/6] added flag check --- modules/observer.py | 6 +++++- modules/observer/templates/observer.default.erb | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/observer.py b/modules/observer.py index be956242..a9237398 100644 --- a/modules/observer.py +++ b/modules/observer.py @@ -5,7 +5,7 @@ import lib -def generate(host): +def generate(host, *args): info = {} resolvers = lib.get_servers_for_node('eventdns', host) @@ -16,6 +16,10 @@ def generate(host): info['dns_target'] = 'slashdot.org.' info['interface'] = 'eth0' + if 'noipv6' in args: + info['disable6'] = '-disable6' + if 'noipv4' in args: + info['disable4'] = '-disable4' return {'observer': info} # vim: ts=4: sts=4: sw=4: expandtab diff --git a/modules/observer/templates/observer.default.erb b/modules/observer/templates/observer.default.erb index c6b746f5..4935c222 100644 --- a/modules/observer/templates/observer.default.erb +++ b/modules/observer/templates/observer.default.erb @@ -1,4 +1,4 @@ # AUTOGENERATED BY PUPPET # All manual changes will be overwritten -ARGS="-dns -disable6 <%= @nameservers.join(',') -%> -icmp-targets <%= @icmp_target %> -qname <%= @dns_target %> -interface <%= @interface %>" +ARGS="-dns <%= @disable4 %> <%= @disable6 %> <%= @nameservers.join(',') -%> -icmp-targets <%= @icmp_target %> -qname <%= @dns_target %> -interface <%= @interface %>" \ No newline at end of file From ca9bd2cb51131446bc5438083cb9d475e49bc695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Malmstr=C3=B6m?= Date: Tue, 24 Mar 2026 18:43:13 +0000 Subject: [PATCH 3/6] Update init.pp --- modules/observer/manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/observer/manifests/init.pp b/modules/observer/manifests/init.pp index aabcc754..0481ccd9 100644 --- a/modules/observer/manifests/init.pp +++ b/modules/observer/manifests/init.pp @@ -12,7 +12,7 @@ # No parameters; # -class observer($nameservers, $icmp_target, $dns_target, $interface) { +class observer($nameservers, $icmp_target, $dns_target, $disable6, $disable4) { # Create directories for observer file { '/opt/observer': From 865788288400766240b925d01c2f7a885b7f3601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Malmstr=C3=B6m?= Date: Tue, 24 Mar 2026 18:48:23 +0000 Subject: [PATCH 4/6] Update observer.py --- modules/observer.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/observer.py b/modules/observer.py index a9237398..f7520478 100644 --- a/modules/observer.py +++ b/modules/observer.py @@ -18,8 +18,12 @@ def generate(host, *args): if 'noipv6' in args: info['disable6'] = '-disable6' + else: + info['disable6'] = '' if 'noipv4' in args: - info['disable4'] = '-disable4' + info['disable4'] = '-disable4' + else: + info['disable4'] = '' return {'observer': info} # vim: ts=4: sts=4: sw=4: expandtab From a5840bb9e0df64b1973887671238766e652920ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Malmstr=C3=B6m?= Date: Tue, 24 Mar 2026 18:50:53 +0000 Subject: [PATCH 5/6] Update init.pp --- modules/observer/manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/observer/manifests/init.pp b/modules/observer/manifests/init.pp index 0481ccd9..67bc6774 100644 --- a/modules/observer/manifests/init.pp +++ b/modules/observer/manifests/init.pp @@ -12,7 +12,7 @@ # No parameters; # -class observer($nameservers, $icmp_target, $dns_target, $disable6, $disable4) { +class observer($nameservers, $icmp_target, $dns_target, $interface, $disable6, $disable4) { # Create directories for observer file { '/opt/observer': From e7289e98514b9302a90a299d0e740b32f541ce94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Malmstr=C3=B6m?= Date: Tue, 24 Mar 2026 19:00:06 +0000 Subject: [PATCH 6/6] Fix --- modules/observer.py | 4 ++-- modules/observer/templates/observer.default.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/observer.py b/modules/observer.py index f7520478..2f84f8a5 100644 --- a/modules/observer.py +++ b/modules/observer.py @@ -17,11 +17,11 @@ def generate(host, *args): info['interface'] = 'eth0' if 'noipv6' in args: - info['disable6'] = '-disable6' + info['disable6'] = '-disable6 ' else: info['disable6'] = '' if 'noipv4' in args: - info['disable4'] = '-disable4' + info['disable4'] = '-disable4 ' else: info['disable4'] = '' return {'observer': info} diff --git a/modules/observer/templates/observer.default.erb b/modules/observer/templates/observer.default.erb index 4935c222..39645626 100644 --- a/modules/observer/templates/observer.default.erb +++ b/modules/observer/templates/observer.default.erb @@ -1,4 +1,4 @@ # AUTOGENERATED BY PUPPET # All manual changes will be overwritten -ARGS="-dns <%= @disable4 %> <%= @disable6 %> <%= @nameservers.join(',') -%> -icmp-targets <%= @icmp_target %> -qname <%= @dns_target %> -interface <%= @interface %>" \ No newline at end of file +ARGS="<%= @disable4 %><%= @disable6 %>-dns <%= @nameservers.join(',') -%> -icmp-targets <%= @icmp_target %> -qname <%= @dns_target %> -interface <%= @interface %>" \ No newline at end of file