Slightly modify ldapinfo, let's see what blows up

diff --git a/files/etc/puppet/lib/puppet/parser/functions/ldapinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/ldapinfo.rb
index 3564de329ee99d31af9f762988bc9291c631edb9..3a687224dd5a5fa71173fa288ff6ba8b8292fb0a 100644 (file)
--- a/files/etc/puppet/lib/puppet/parser/functions/ldapinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/ldapinfo.rb
@@ -19,8 +19,7 @@ module Puppet::Parser::Functions
         unless attributes.include?("*")
           next if attributes.any?{ |a|  not x[a] or x[a].empty? }
         end
-        results[x['hostname'][0]] = []
-        results[x['hostname'][0]] << x
+        results[x['hostname'][0]] = x
       end
     rescue LDAP::ResultError
       raise Puppet::ParseError, "LDAP error"

diff --git a/files/etc/puppet/lib/puppet/parser/functions/whohosts.rb b/files/etc/puppet/lib/puppet/parser/functions/whohosts.rb
index e31688bad966a9b08becba86906ad03462179040..c2bda8c4aa05db1fdf7052d5ef4dbb0e427515cd 100644 (file)
--- a/files/etc/puppet/lib/puppet/parser/functions/whohosts.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/whohosts.rb
@@ -12,8 +12,8 @@ module Puppet::Parser::Functions
     ans = "unknown"
     yaml = YAML.load_file(yamlfile)
 
-    if (nodeinfo['ldap'].at(0)) and (nodeinfo['ldap'][0].has_key?('ipHostNumber'))
-      nodeinfo['ldap'][0]['ipHostNumber'].each do |addr|
+    if (nodeinfo['ldap'].has_key?('ipHostNumber'))
+      nodeinfo['ldap']['ipHostNumber'].each do |addr|
         yaml.keys.each do |hoster|
           yaml[hoster].each do |net|
             if IPAddr.new(net).include?(addr)

diff --git a/modules/exim/templates/manualroute.erb b/modules/exim/templates/manualroute.erb
index 4f241704c7ffc0ec56332d8e72ff9a88367c5ed4..2b84b4ede1d4545636d64d513014aba7c901d020 100644 (file)
--- a/modules/exim/templates/manualroute.erb
+++ b/modules/exim/templates/manualroute.erb
@@ -20,7 +20,7 @@ end
 
 mxregex = Regexp.new('^\d+\s+(.*)\.$')
 mxinfo.keys.sort.each do |host|
-  mxinfo[host][0]['mXRecord'].each do |mx|
+  mxinfo[host]['mXRecord'].each do |mx|
     mxmatch = mxregex.match(mx)
     if mxmatches.include?(mxmatch[1])
       route = host + ":\t\t" + host

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index bd298c92339962f40ed9b3bfe97da2a2529867bd..c39b03d651714fe69908f26693612f91c2fa1ffc 100644 (file)
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -19,7 +19,7 @@
   mailrelay = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['mailrelay']
-          keyinfo[node][0]['ipHostNumber'].each do |ip|
+          keyinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              mailrelay << ip
           end
@@ -33,7 +33,7 @@
   mailrelay = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['mailrelay']
-          keyinfo[node][0]['ipHostNumber'].each do |ip|
+          keyinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              mailrelay << ip
           end
@@ -49,7 +49,7 @@
   nagii = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
-          keyinfo[node][0]['ipHostNumber'].each do |ip|
+          keyinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              nagii << ip
           end
@@ -63,7 +63,7 @@
   nagii = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
-          keyinfo[node][0]['ipHostNumber'].each do |ip|
+          keyinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              nagii << ip
           end
@@ -79,7 +79,7 @@
   munins = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['muninmaster']
-          keyinfo[node][0]['ipHostNumber'].each do |ip|
+          keyinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              munins << ip
           end
@@ -93,7 +93,7 @@
   munins = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['muninmaster']
-          keyinfo[node][0]['ipHostNumber'].each do |ip|
+          keyinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              munins << ip
           end
@@ -109,7 +109,7 @@
   dbs = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['dbmaster']
-          keyinfo[node][0]['ipHostNumber'].each do |ip|
+          keyinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              dbs << ip
           end
@@ -123,7 +123,7 @@
   dbs = []
   localinfo.keys.sort.each do |node|
       if localinfo[node]['dbmaster']
-          keyinfo[node][0]['ipHostNumber'].each do |ip|
+          keyinfo[node]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              dbs << ip
           end
@@ -138,8 +138,8 @@
 @def $HOST_DEBIAN_V4 = (<%=
   dbs = []
   keyinfo.keys.sort.each do |node|
-      next unless keyinfo[node][0].has_key?('ipHostNumber')
-      keyinfo[node][0]['ipHostNumber'].each do |ip|
+      next unless keyinfo[node].has_key?('ipHostNumber')
+      keyinfo[node]['ipHostNumber'].each do |ip|
          next if ip =~ /:/
          dbs << ip
       end
@@ -151,8 +151,8 @@
 @def $HOST_DEBIAN_V6  = (<%=
   dbs = []
   keyinfo.keys.sort.each do |node|
-      next unless keyinfo[node][0].has_key?('ipHostNumber')
-      keyinfo[node][0]['ipHostNumber'].each do |ip|
+      next unless keyinfo[node].has_key?('ipHostNumber')
+      keyinfo[node]['ipHostNumber'].each do |ip|
          next if ip =~ /\./
          dbs << ip
       end

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index fbe118017528f452baa7f1e6c51c252c93d46143..2b51dceebf442a8f3bcec513904e59c5b5837f67 100644 (file)
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -15,28 +15,28 @@ if nodeinfo.has_key?('nameinfo')
 end
 
 purp += 'Welcome to ' + fqdn
-if (nodeinfo['ldap'].at(0)) and (nodeinfo['ldap'][0].has_key?('purpose'))
-  if nodeinfo['ldap'][0]['purpose'].include?('buildd')
+if (nodeinfo['ldap'].has_key?('purpose'))
+  if nodeinfo['ldap']['purpose'].include?('buildd')
     purp += ", the Debian "
-    if nodeinfo['ldap'][0].has_key?('architecture')
-      purp += nodeinfo['ldap'][0]['architecture'][0]
+    if nodeinfo['ldap'].has_key?('architecture')
+      purp += nodeinfo['ldap']['architecture'][0]
     end
     purp += " build daemon\n"
-  elsif nodeinfo['ldap'][0]['purpose'].include?('porterbox')
+  elsif nodeinfo['ldap']['purpose'].include?('porterbox')
     purp += ", the Debian "
-    if nodeinfo['ldap'][0].has_key?('architecture')
-      purp += nodeinfo['ldap'][0]['architecture'][0]
+    if nodeinfo['ldap'].has_key?('architecture')
+      purp += nodeinfo['ldap']['architecture'][0]
     end
     purp += " porterbox\n"
     purp += "\n"
     purp += "See 'dchroot -l' for a list of available chroots.\n"
-    if nodeinfo['ldap'][0].has_key?('admin')
-      purp += "Please contact #{nodeinfo['ldap'][0]['admin'][0]} for install requests,\n"
+    if nodeinfo['ldap'].has_key?('admin')
+      purp += "Please contact #{nodeinfo['ldap']['admin'][0]} for install requests,\n"
       purp += "following the recommendations in <URL:http://dsa.debian.org/doc/install-req/>.\n"
     end
   else
     purp += ", used for the following services:\n"
-    nodeinfo['ldap'][0]['purpose'].sort.each do |l|
+    nodeinfo['ldap']['purpose'].sort.each do |l|
       if l =~ /\[\[(\*|-)?(.*?)\]\]/
         l = $2
       end

diff --git a/modules/munin-node/templates/munin-node.conf.erb b/modules/munin-node/templates/munin-node.conf.erb
index 265b586f4a8d130a21910fa5b3f56dc4bfcddbf7..231b1a25a0350f9a06fb8a4296979f9c81a39963 100644 (file)
--- a/modules/munin-node/templates/munin-node.conf.erb
+++ b/modules/munin-node/templates/munin-node.conf.erb
@@ -42,7 +42,7 @@ ignore_file \.rpm(save|new)$
 str = ''
 localinfo.keys.sort.each do |node|
    if localinfo[node]['muninmaster']
-      keyinfo[node][0]['ipHostNumber'].each do |ip|
+      keyinfo[node]['ipHostNumber'].each do |ip|
          str += "allow ^" + ip.split('.').join('\.') + "$\n"
       end
    end

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index b8a26d696693bd3746e96d14fc9e3073e6ec3ebf..bf6c2f95dfc779229451542d61d01b26cb02a36c 100644 (file)
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -7,7 +7,7 @@
 nagii = []
 localinfo.keys.sort.each do |node|
   if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
-    nagii << keyinfo[node][0]['ipHostNumber']
+    nagii << keyinfo[node]['ipHostNumber']
   end
 end
 

diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb
index b7eadf1bf41c51a21394e9d3f7ecabaefea9a878..84469dfffc71b38738d50fa1ea573f0fb311cc11 100644 (file)
--- a/modules/named/templates/named.conf.options.erb
+++ b/modules/named/templates/named.conf.options.erb
@@ -8,7 +8,7 @@ acl Nagios {
   str = ''
   localinfo.keys.sort.each do |node|
       if localinfo[node]['nagiosmaster']
-          keyinfo[node][0]['ipHostNumber'].each do |ip|
+          keyinfo[node]['ipHostNumber'].each do |ip|
               str += "\t" + ip + "/32;\n"
           end
       end

diff --git a/modules/portforwarder/templates/authorized_keys.erb b/modules/portforwarder/templates/authorized_keys.erb
index ff38994b1de56a365d2b284c1d2ce43cb1252e2c..985f367c7aaf3d094c06214b9b86ee094aad8ba7 100644 (file)
--- a/modules/portforwarder/templates/authorized_keys.erb
+++ b/modules/portforwarder/templates/authorized_keys.erb
@@ -29,7 +29,7 @@ config.each_pair do |sourcehost, services|
 
        if allowed_ports.length > 0
                sshkey = getportforwarderkey(sourcehost)
-               remote_ip = keyinfo[sourcehost][0]['ipHostNumber'].join(',')
+               remote_ip = keyinfo[sourcehost]['ipHostNumber'].join(',')
                local_bind = '127.101.%d.%d'%[ (sourcehost.hash / 256 % 256), sourcehost.hash % 256 ]
 
                lines << "# from #{sourcehost}"

diff --git a/modules/ssh/templates/authorized_keys.erb b/modules/ssh/templates/authorized_keys.erb
index 53681acc69cfef5f428ef50ed78746d356a6020a..ba6f9f6ff4f47dbc2d37cc105aa3b32cd41d03a5 100644 (file)
--- a/modules/ssh/templates/authorized_keys.erb
+++ b/modules/ssh/templates/authorized_keys.erb
@@ -37,8 +37,8 @@ ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAuGJnElqbhgLtmJp/de8s42cAwKrkAhFq5u8EAkauEv6B
    when "bartok.debian.org", "beethoven.debian.org" then
      out = ''
      keyinfo.keys.sort.each do |node|
-       out += '# ' + keyinfo[node][0]['hostname'].to_s + '
-command="/usr/lib/da-backup/da-backup-ssh-wrap ' + keyinfo[node][0]['hostname'].to_s + '",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="' + keyinfo[node][0]['ipHostNumber'].join(',') + '" ' + keyinfo[node][0]['sshRSAHostKey'].to_s + '
+       out += '# ' + keyinfo[node]['hostname'].to_s + '
+command="/usr/lib/da-backup/da-backup-ssh-wrap ' + keyinfo[node]['hostname'].to_s + '",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,from="' + keyinfo[node]['ipHostNumber'].join(',') + '" ' + keyinfo[node]['sshRSAHostKey'].to_s + '
 
 '
      end