Merge pull request #11 from inkblot/wildcard-support
Support wildcard DNS names
This commit is contained in:
commit
5f65a8d70e
@ -7,7 +7,7 @@ Puppet::Type.newtype(:dns_rr) do
|
|||||||
desc "Class/Type/Name for the resource record"
|
desc "Class/Type/Name for the resource record"
|
||||||
|
|
||||||
validate do |value|
|
validate do |value|
|
||||||
if (value =~ /^([A-Z]+)\/([A-Z]+)\/[a-zA-Z0-9._-]+$/)
|
if (value =~ /^([A-Z]+)\/([A-Z]+)\/((\*\.)?([a-zA-Z0-9_-]+\.)*[a-zA-Z0-9_-]+)$/)
|
||||||
rrclass = $1
|
rrclass = $1
|
||||||
if ( !%w(IN CH HS).include? rrclass )
|
if ( !%w(IN CH HS).include? rrclass )
|
||||||
Util::Errors.fail "Invalid resource record class: %s" % rrdata
|
Util::Errors.fail "Invalid resource record class: %s" % rrdata
|
||||||
|
|||||||
@ -24,7 +24,7 @@ Puppet::Type.newtype(:resource_record) do
|
|||||||
isrequired
|
isrequired
|
||||||
|
|
||||||
validate do |value|
|
validate do |value|
|
||||||
Util::Errors.fail "Invalid value for record: #{value}" unless value =~ /^([a-zA-Z0-9_-]+\.)*[a-zA-Z0-9_-]+$/
|
Util::Errors.fail "Invalid value for record: #{value}" unless value =~ /^(\*\.)?([a-zA-Z0-9_-]+\.)*[a-zA-Z0-9_-]+$/
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user