diff options
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/puppet/type/host.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/puppet/type/host.rb b/lib/puppet/type/host.rb index 2a04474e8..3e34c0b60 100755 --- a/lib/puppet/type/host.rb +++ b/lib/puppet/type/host.rb @@ -1,5 +1,3 @@ -require 'ipaddr' - module Puppet newtype(:host) do ensurable @@ -89,7 +87,7 @@ module Puppet isnamevar validate do |value| - unless value =~ /^([a-z0-9]([-a-z0-9]*[a-z0-9])?\.)+((a[cdefgilmnoqrstuwxz]|aero|arpa)|(b[abdefghijmnorstvwyz]|biz)|(c[acdfghiklmnorsuvxyz]|cat|com|coop)|d[ejkmoz]|(e[ceghrstu]|edu)|f[ijkmor]|(g[abdefghilmnpqrstuwy]|gov)|h[kmnrtu]|(i[delmnoqrst]|info|int)|(j[emop]|jobs)|k[eghimnprwyz]|l[abcikrstuvy]|(m[acdghklmnopqrstuvwxyz]|mil|mobi|museum)|(n[acefgilopruz]|name|net)|(om|org)|(p[aefghklmnrstwy]|pro)|qa|r[eouw]|s[abcdeghijklmnortvyz]|(t[cdfghjklmnoprtvwz]|travel)|u[agkmsyz]|v[aceginu]|w[fs]|y[etu]|z[amw])$/ + unless value =~ /^\w+-?[\w+]?\.?[\w+.{1}]*\w+$/ raise Puppet::Error, "Invalid host name" end end |