Merge branch 'master' of git://git.debian.org/mirror/dsa-puppet

[mirror/dsa-puppet.git] / modules / apache2 / templates / conf-builddlist.erb

diff --git a/modules/apache2/templates/conf-builddlist.erb b/modules/apache2/templates/conf-builddlist.erb
index 6f80ec0..1aa4758 100644 (file)
--- a/modules/apache2/templates/conf-builddlist.erb
+++ b/modules/apache2/templates/conf-builddlist.erb
@@ -3,25 +3,24 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<Macro CommonBuilddHostList>
+<Macro DebianBuilddHostList>
 
 <%=
   lines = []
 
-  keyinfo.keys.sort.each do |node|
-    if keyinfo[node]['purpose'].include?('buildd')
-      lines << "  # #{keyinfo[node]['hostname'].to_s} #{nodeinfo['ldap']['architecture'][0]}"
-      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
-     out
-   end
+      end
+    end
+  end
 
   lines.join("\n")
 # vim:set et:
 # vim:set sts=2 ts=2:
 # vim:set shiftwidth=2:
 %>
-
 </Macro>