Move noise to some place less annoying

[dsa-puppet.git] / modules / motd / templates / motd.erb

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index b54981bed08f392cb882ee491e12184b6c2ffce9..ba8323ad17576e9ce2139367052b52905ba3ccb1 100644 (file)
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -1,6 +1,8 @@
 
 This device is for authorized users only.  All traffic on this device
-is monitored and will be used as evidence for prosecutions.
+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)
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -50,6 +52,10 @@ 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" + wrap(nodeinfo['footer']) + "\n"
 end