X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=a6e5b4a496399196fd87f71d00be9464b22ee8a9;hb=567227e19a0c3df247b722211d3fa5bfab22ca89;hp=fbe118017528f452baa7f1e6c51c252c93d46143;hpb=0fd4e85c3ae779fff9edd8dda898a19276b25519;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index fbe118017..a6e5b4a49 100644
--- 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
@@ -50,8 +50,12 @@ else
   purp += "\n"
 end
 
+if (nodeinfo['ldap'].has_key?('physicalHost'))
+  purp += "\nThis virtual server runs on the physical host #{nodeinfo['ldap']['physicalHost'][0]}.\n"
+end
+
 if nodeinfo.has_key?('footer')
-  purp += "\n" + nodeinfo['footer'] + "\n"
+  purp += "\n" + wrap(nodeinfo['footer']) + "\n"
 end
 purp
 -%>