From 98e2801edd59d7ffe82d2fe8bda10727d3079263 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 2 Mar 2011 12:24:35 +0100 Subject: [PATCH] keyinfo is really more of an allnodeinfo by now --- manifests/site.pp | 2 +- modules/apache2/templates/conf-builddlist.erb | 10 ++++--- modules/ferm/templates/defs.conf.erb | 28 +++++++++---------- .../munin-node/templates/munin-node.conf.erb | 2 +- modules/nagios/templates/inc-debian.org.erb | 2 +- .../named/templates/named.conf.options.erb | 2 +- .../templates/authorized_keys.erb | 2 +- modules/ssh/templates/authorized_keys.erb | 2 +- 8 files changed, 26 insertions(+), 24 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 163adde0d..5dfeef0a8 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -17,7 +17,7 @@ node default { $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml") $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml") $hosterinfo = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml") - $keyinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber", "purpose") + $allnodeinfo = allnodeinfo("sshRSAHostKey", "ipHostNumber", "purpose") $mxinfo = allnodeinfo("mXRecord") notice("hoster for ${fqdn} is ${hosterinfo}") diff --git a/modules/apache2/templates/conf-builddlist.erb b/modules/apache2/templates/conf-builddlist.erb index 1e9483692..826294920 100644 --- a/modules/apache2/templates/conf-builddlist.erb +++ b/modules/apache2/templates/conf-builddlist.erb @@ -8,10 +8,11 @@ <%= lines = [] - keyinfo.keys.sort.each do |node| - if keyinfo[node]['purpose'].include?('buildd') - lines << " # #{keyinfo[node]['hostname'].to_s}" - keyinfo[node]['ipHostNumber'].each do |addr| + allnodeinfo.keys.sort.each do |node| + next unless allnodeinfo[node]['purpose'] + if allnodeinfo[node]['purpose'].include?('buildd') + lines << " # #{allnodeinfo[node]['hostname'].to_s}" + allnodeinfo[node]['ipHostNumber'].each do |addr| lines << " allow from #{addr}" end end @@ -19,6 +20,7 @@ lines.join("\n") # vim:set et: +# vim:set tabwidth=2: # vim:set sts=2 ts=2: # vim:set shiftwidth=2: %> diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb index 6c2d182fb..ae637fe04 100644 --- 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]['ipHostNumber'].each do |ip| + allnodeinfo[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]['ipHostNumber'].each do |ip| + allnodeinfo[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]['ipHostNumber'].each do |ip| + allnodeinfo[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]['ipHostNumber'].each do |ip| + allnodeinfo[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]['ipHostNumber'].each do |ip| + allnodeinfo[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]['ipHostNumber'].each do |ip| + allnodeinfo[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]['ipHostNumber'].each do |ip| + allnodeinfo[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]['ipHostNumber'].each do |ip| + allnodeinfo[node]['ipHostNumber'].each do |ip| next if ip =~ /:/ dbs << ip end @@ -137,9 +137,9 @@ @def $HOST_DEBIAN_V4 = (<%= dbs = [] - keyinfo.keys.sort.each do |node| - next unless keyinfo[node].has_key?('ipHostNumber') - keyinfo[node]['ipHostNumber'].each do |ip| + allnodeinfo.keys.sort.each do |node| + next unless allnodeinfo[node].has_key?('ipHostNumber') + allnodeinfo[node]['ipHostNumber'].each do |ip| next if ip =~ /:/ dbs << ip end @@ -150,9 +150,9 @@ @def $HOST_DEBIAN_V6 = (<%= dbs = [] - keyinfo.keys.sort.each do |node| - next unless keyinfo[node].has_key?('ipHostNumber') - keyinfo[node]['ipHostNumber'].each do |ip| + allnodeinfo.keys.sort.each do |node| + next unless allnodeinfo[node].has_key?('ipHostNumber') + allnodeinfo[node]['ipHostNumber'].each do |ip| next if ip =~ /\./ dbs << ip end diff --git a/modules/munin-node/templates/munin-node.conf.erb b/modules/munin-node/templates/munin-node.conf.erb index 8f55bf892..45cf119a8 100644 --- 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]['ipHostNumber'].each do |ip| + allnodeinfo[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 bf6c2f95d..1da5548ff 100644 --- 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]['ipHostNumber'] + nagii << allnodeinfo[node]['ipHostNumber'] end end diff --git a/modules/named/templates/named.conf.options.erb b/modules/named/templates/named.conf.options.erb index 3a2624a80..f80122285 100644 --- 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]['ipHostNumber'].each do |ip| + allnodeinfo[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 985f367c7..5cb76624d 100644 --- 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]['ipHostNumber'].join(',') + remote_ip = allnodeinfo[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 2a546ebe2..c9a3cbd68 100644 --- a/modules/ssh/templates/authorized_keys.erb +++ b/modules/ssh/templates/authorized_keys.erb @@ -38,7 +38,7 @@ ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAuGJnElqbhgLtmJp/de8s42cAwKrkAhFq5u8EAkauEv6B <%= machine_keys = case fqdn when "beethoven.debian.org" then out = '' - keyinfo.keys.sort.each do |node| + allnodeinfo.keys.sort.each do |node| 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 + ' -- 2.20.1