X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=e4fb77f759a3c561079c1fa319dcfc448f99cf4c;hb=96055f5e2bbc5c9185f1b194a039df68c9549af2;hp=2b51dceebf442a8f3bcec513904e59c5b5837f67;hpb=483f9c11e2419da2aa3fe83f306a2adf5f6938ef;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 2b51dceeb..e4fb77f75 100644
--- 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 machine you agree to abide by the Debian Machines Usage Policies
+<URL:http://www.debian.org/devel/dmup>.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -50,8 +52,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
 -%>