X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=files%2Fetc%2Fpuppet%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fnodeinfo.rb;h=c946206a55d8cd2815a3797efd016234af8d5c6a;hb=5ca9e9a43ca1861539b4e6385e16090f9ede73f0;hp=7a875ea38cd4aeab62df2d5eb5e2b2470d5b3d46;hpb=c714298e1ffbf67e70c9207f72058e64217fc006;p=mirror%2Fdsa-puppet.git

diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
index 7a875ea38..c946206a5 100644
--- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
@@ -3,60 +3,18 @@ module Puppet::Parser::Functions
 
     host = args[0]
     yamlfile = args[1]
-    parser.watch_file(yamlfile)
 
-    require 'ldap'
-    require 'yaml'
+    require '/etc/puppet/lib/puppet/parser/functions/ldapinfo.rb'
 
-    $KCODE = 'utf-8'
+    results         = function_yamlinfo(host, yamlfile)
+    results['ldap'] = function_ldapinfo(host, '*')
 
-    yaml = YAML.load_file(yamlfile)
-    results = {}
+    results['misc'] = {}
+    # find out if we are behind nat
+    v4addrs = $v4ips.split(',')
+    intersection = v4addrs & nodeinfo['ldap']['ipHostNumber']
+    results['misc']['natted'] = intersection.empty?
 
-    ['nameinfo', 'footer'].each do |detail|
-      if yaml.has_key?(detail)
-        if yaml[detail].has_key?(host)
-          results[detail] = yaml[detail][host]
-        end
-      end
-    end
-
-    if yaml.has_key?('services')
-      yaml['services'].each_pair do |service, hostlist|
-        hostlist=[hostlist] unless hostlist.kind_of?(Array)
-        results[service] = hostlist.include?(host)
-      end
-    end
-
-    results['mail_port']      = ''
-    results['smarthost']      = ''
-    results['heavy_exim']     = ''
-    results['smarthost_port'] = 587
-    results['reservedaddrs']  = '0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5'
-
-    if yaml['host_settings'].kind_of?(Hash)
-      yaml['host_settings'].each_pair do |property, values|
-        if values.kind_of?(Hash)
-          results[property] = values[host] if values.has_key?(host)
-        elsif values.kind_of?(Array)
-          results[property] = "true" if values.include?(host)
-        end
-      end
-    end
-
-    ldap = LDAP::Conn.new('db.debian.org')
-
-    results['ldap'] = []
-    filter = '(hostname=' + host +')'
-    begin
-      ldap.search2('ou=hosts,dc=debian,dc=org', LDAP::LDAP_SCOPE_SUBTREE, filter) do |x|
-        results['ldap'] << x
-      end
-    rescue LDAP::ResultError
-    rescue RuntimeError
-    ensure
-      ldap.unbind
-    end
     return(results)
   end
 end