Merge pull request #11 from inkblot/wildcard-support

Support wildcard DNS names
This commit is contained in:
Nate Riffe 2014-09-13 09:27:29 -05:00
commit 5f65a8d70e
2 changed files with 2 additions and 2 deletions

View File

@ -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_-]+\.)*[a-zA-Z0-9_-]+)$/)
rrclass = $1
if ( !%w(IN CH HS).include? rrclass )
Util::Errors.fail "Invalid resource record class: %s" % rrdata

View File

@ -24,7 +24,7 @@ Puppet::Type.newtype(:resource_record) do
isrequired
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