Merge pull request #8 from inkblot/dig-tsig
Closes #5 I'll work on #3 next week.
This commit is contained in:
commit
9741dd509e
@ -107,7 +107,12 @@ private
|
||||
|
||||
def query
|
||||
unless @query
|
||||
@query = dig("@#{server}", '+noall', '+answer', name, type, '-c', rrclass).lines.map do |line|
|
||||
if keyed?
|
||||
dig_text = dig("@#{server}", '+noall', '+answer', name, type, '-c', rrclass, '-y', tsig_param)
|
||||
else
|
||||
dig_text = dig("@#{server}", '+noall', '+answer', name, type, '-c', rrclass)
|
||||
end
|
||||
@query = dig_text.lines.map do |line|
|
||||
linearray = line.chomp.split(/\s+/, 5)
|
||||
{
|
||||
:name => linearray[0],
|
||||
|
||||
@ -7,7 +7,7 @@ Puppet::Type.newtype(:dns_rr) do
|
||||
desc "Class/Type/Name for the resource record"
|
||||
|
||||
validate do |value|
|
||||
if (value =~ /^([A-Z]+)\/([A-Z]+)\/[a-zA-Z0-9.-]+$/)
|
||||
if (value =~ /^([A-Z]+)\/([A-Z]+)\/[a-zA-Z0-9._-]+$/)
|
||||
rrclass = $1
|
||||
if ( !%w(IN CH HS).include? rrclass )
|
||||
raise ArgumentError, "Invalid resource record class: %s" % rrdata
|
||||
|
||||
Loading…
Reference in New Issue
Block a user