Maybe this fixes stuff

[mirror/dsa-puppet.git] / files / etc / puppet / lib / puppet / parser / functions / nodeinfo.rb

diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
index 7ffe5a0..7a875ea 100644 (file)
--- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
@@ -21,20 +21,28 @@ module Puppet::Parser::Functions
       end
     end
 
-#    results['bugsmaster']     = host == 'rietz.debian.org'
-#    results['qamaster']       = host == 'merkel.debian.org'
-#    results['mailrelay']      = host == 'spohr.debian.org'
-#    results['rtmaster']       = host == 'spohr.debian.org'
-#    results['packagesmaster'] = host == 'powell.debian.org'
-#
-#    nodeinfo['reservedaddrs'] = case host
-#      when "ball.debian.org": "0.0.0.0/8 : 127.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"
-#      else "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"
-#    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')
 
@@ -52,3 +60,5 @@ module Puppet::Parser::Functions
     return(results)
   end
 end
+
+# vim: set fdm=marker ts=2 sw=2 et: