From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 25 Aug 2010 09:35:08 +0000 (+0200)
Subject: Try adding more stuff to the motd
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=0fd4e85c3ae779fff9edd8dda898a19276b25519;p=mirror%2Fdsa-puppet.git

Try adding more stuff to the motd
---

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 37d9b4fe3..fbe118017 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -28,6 +28,12 @@ if (nodeinfo['ldap'].at(0)) and (nodeinfo['ldap'][0].has_key?('purpose'))
       purp += nodeinfo['ldap'][0]['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"
+      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|
@@ -52,3 +58,8 @@ purp
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+<%
+# vim:set et:
+# vim:set sts=2 ts=2:
+# vim:set shiftwidth=2:
+-%>