From: Julien Cristau <jcristau@debian.org>
Date: Tue, 13 Aug 2019 14:53:47 +0000 (+0200)
Subject: Handle ipv6 addresses in named.conf.options
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=27803b2dcb21abaf755d0bbd50bb6fbc8f998e67;p=mirror%2Fdsa-puppet.git

Handle ipv6 addresses in named.conf.options
---

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index cfb1a704c..95370b1c9 100644
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -8,9 +8,13 @@ acl Nagios {
   roles = scope.lookupvar('site::roles')
   str = ''
   roles['nagiosmaster'].each do |node|
-          scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].each do |ip|
-              str += "\t" + ip + "/32;\n"
-          end
+          str += scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber'].collect do |ip|
+              if ip =~ /:/
+                  "\t#{ip}/128;\n"
+              else
+                  "\t#{ip}/32;\n"
+              end
+          end.join("")
   end
   str-%>
 };