From 096ff350b9068f4ea5a6d0e8ccac6ee45c2d10dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Wed, 16 Feb 2022 15:07:59 +0100 Subject: Disallow NS records. --- lib/puppet/provider/dns_record/zonefile.rb | 14 +++++--------- lib/puppet/type/dns_record.rb | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/puppet/provider/dns_record/zonefile.rb b/lib/puppet/provider/dns_record/zonefile.rb index df220b7..1efe003 100644 --- a/lib/puppet/provider/dns_record/zonefile.rb +++ b/lib/puppet/provider/dns_record/zonefile.rb @@ -38,7 +38,7 @@ Puppet::Type.type(:dns_record).provide(:zonefile) do # :SOA case type - when :A, :MX, :NS, :CNAME, :A4, :AAAA, :PTR, :SRV + when :A, :MX, :CNAME, :A4, :AAAA, :PTR, :SRV data[:host] = resource[:value] when :TXT data[:text] = resource[:value] @@ -49,8 +49,6 @@ Puppet::Type.type(:dns_record).provide(:zonefile) do case type when :AAAA zone.add_record(:a4, data) - when :NS - zone.add_record(:ns, data) else zone.add_record(type, data) end @@ -61,8 +59,6 @@ Puppet::Type.type(:dns_record).provide(:zonefile) do case type when :AAAA zone.a4.reject! {|record| record[:name] == record_to_remove[:key] } - when :NS - zone.ns.reject! {|record| record[:name] == record_to_remove[:key] && record[:host] == record_to_remove[:value]} when nil Zonefile::RECORDS.map{|t| t.downcase.intern}.each do |t| zone.records[t].reject! {|record| record[:name] == record_to_remove[:key] } @@ -102,6 +98,10 @@ Puppet::Type.type(:dns_record).provide(:zonefile) do resource[:type] end + def key + resource[:key] + end + def value record = find_self record && record[:host] @@ -114,10 +114,6 @@ Puppet::Type.type(:dns_record).provide(:zonefile) do record[:host] = value end - def key - resource[:key] - end - def ttl record = find_self record && record[:ttl] diff --git a/lib/puppet/type/dns_record.rb b/lib/puppet/type/dns_record.rb index f8dc00e..0f2be90 100644 --- a/lib/puppet/type/dns_record.rb +++ b/lib/puppet/type/dns_record.rb @@ -20,7 +20,7 @@ Puppet::Type.newtype(:dns_record) do newproperty(:type) do desc "DNS Record type, such as A, or TXT" - newvalues(:A, :AAAA, :CNAME, :NS, :PTR) + newvalues(:A, :AAAA, :CNAME, :PTR) isrequired end -- cgit v1.2.3