X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=files%2Fetc%2Fpuppet%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fnodeinfo.rb;h=2e0521d191c6367069932a667dc2456656f639f8;hb=8bdab078f1596badc3ea821351068043f5485ae2;hp=aa641c3cfaa197e53aeb3c346bc7a3109eca337a;hpb=f3dbb425269f068ff11c7b1f56faf1285cf7c97a;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 aa641c3cf..2e0521d19 100644
--- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
@@ -5,8 +5,8 @@ module Puppet::Parser::Functions
     yamlfile = args[1]
     parser.watch_file(yamlfile)
 
-    require 'ldap'
     require 'yaml'
+    require '/etc/puppet/lib/puppet/parser/functions/ldapinfo.rb'
 
     $KCODE = 'utf-8'
 
@@ -34,39 +34,18 @@ module Puppet::Parser::Functions
     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.has_key?('mail_port') and yaml['mail_port'].has_key?(host)
-      results['mail_port'] = yaml['mail_port'][host]
-    end
-
-    if yaml.has_key?('need_smarthost') and yaml['need_smarthost'].include?(host)
-      results['smarthost']     = "mailout.debian.org"
-    end
-
-    if yaml.has_key?('reservedaddrs') and yaml['reservedaddrs'].has_key?(host)
-      results['reservedaddrs'] = yaml['reservedaddrs'][host]
-    end
-
-    if yaml.has_key?('heavy_exim') and yaml['heavy_exim'].include?(host)
-      results['heavy_exim']    = "true"
-    end
-
-    if yaml.has_key?('apache2_defaultconfig') and yaml['apache2_defaultconfig'].include?(host)
-      results['apache2_defaultconfig']    = "true"
+    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
+    results['ldap'] << function_ldapinfo(host, '*')
     return(results)
   end
 end