X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=840832523f9cfc830c8dc32570af00b9c04eb5a6;hb=8c68c6d54aa328ea95126ed5f369039c1d2fff80;hp=ba8323ad17576e9ce2139367052b52905ba3ccb1;hpb=a07d9db1c8e1182fea01d04b2e3f3095d44a0c82;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index ba8323ad1..840832523 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -1,8 +1,8 @@
 
 This device is for authorized users only.  All traffic on this device
 is monitored and will be used as evidence for prosecutions.  By using
-this this maching you agree to abide to the Debian Machines Usage Policies
-(http://www.debian.org/devel/dmup)
+this machine you agree to abide by the Debian Machines Usage Policies
+<URL:http://www.debian.org/devel/dmup>.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -11,6 +11,16 @@ def wrap(s, width=78)
       s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n")
 end
 
+def markup(l)
+  if l =~ /\[\[(\*|-)?(.*?)\]\]/
+    l = $2
+  end
+  if l =~ /\[\[(.*?)\|(.*?)\]\]/
+    l = $2
+  end
+  return l
+end
+
 purp = ''
 if nodeinfo.has_key?('nameinfo')
   purp += wrap(nodeinfo['nameinfo']) + "\n\n"
@@ -39,12 +49,7 @@ if (nodeinfo['ldap'].has_key?('purpose'))
   else
     purp += ", used for the following services:\n"
     nodeinfo['ldap']['purpose'].sort.each do |l|
-      if l =~ /\[\[(\*|-)?(.*?)\]\]/
-        l = $2
-      end
-      if l =~ /\[\[(.*?)\|(.*?)\]\]/
-        l = $2
-      end
+      l = markup(l)
       purp += "\t" + l + "\n"
     end
   end
@@ -56,6 +61,30 @@ if (nodeinfo['ldap'].has_key?('physicalHost'))
   purp += "\nThis virtual server runs on the physical host #{nodeinfo['ldap']['physicalHost'][0]}.\n"
 end
 
+
+vms = []
+allnodeinfo.keys.sort.each do |node|
+  if allnodeinfo[node]['physicalHost'] and allnodeinfo[node]['physicalHost'].include?(fqdn)
+    vms << node
+  end
+end
+unless vms.empty?
+  purp += "\nThe following virtual machines run on this system:\n"
+  vms.each do |node|
+    purp += "\t- #{node}"
+    if allnodeinfo[node]['purpose']
+      purp += ":\n"
+      allnodeinfo[node]['purpose'].sort.each do |l|
+        l = markup(l)
+        purp += "\t    " + l + "\n"
+      end
+    else
+      purp += "\n"
+    end
+  end
+end
+
+
 if nodeinfo.has_key?('footer')
   purp += "\n" + wrap(nodeinfo['footer']) + "\n"
 end