DMUP exists

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

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 24f810b..cd0060f 100644 (file)
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -2,40 +2,41 @@
 This device is for authorized users only.  All traffic on this device
 is monitored and will be used as evidence for prosecutions.
 
 This device is for authorized users only.  All traffic on this device
 is monitored and will be used as evidence for prosecutions.
 

-** IMPORTANT WARNING **
-
-Please read:
-
-http://lists.debian.org/debian-devel-announce/2003/debian-devel-announce-200312/msg00001.html
-
-before doing anything on these machines - especially the "What to do
-when you can login" section.
-

 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 <%=
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 <%=

+def wrap(s, width=78)
+      s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n")
+end
+

 purp = ''
 if nodeinfo.has_key?('nameinfo')
 purp = ''
 if nodeinfo.has_key?('nameinfo')

-  purp += nodeinfo['nameinfo'] + "\n\n"
+  purp += wrap(nodeinfo['nameinfo']) + "\n\n"

 end
 
 purp += 'Welcome to ' + fqdn
 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 "
     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"
     end
     purp += " build daemon\n"

-  elsif nodeinfo['ldap'][0]['purpose'].include?('porterbox')
+  elsif nodeinfo['ldap']['purpose'].include?('porterbox')

     purp += ", the Debian "
     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"
     end
     purp += " porterbox\n"

+    purp += "\n"
+    purp += "See 'dchroot -l' for a list of available chroots.\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"
   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
       if l =~ /\[\[(\*|-)?(.*?)\]\]/
         l = $2
       end


@@ -49,11 +50,23 @@ else
   purp += "\n"
 end
 
   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')
 if nodeinfo.has_key?('footer')

-  purp += "\n" + nodeinfo['footer'] + "\n"
+  purp += "\n" + wrap(nodeinfo['footer']) + "\n"

 end
 purp
 -%>
 
 end
 purp
 -%>
 

+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+      By connecting to this maching you agree to abide to the Debian
+        Machines Usage Policies (http://www.debian.org/devel/dmup)

 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 

+<%
+# vim:set et:
+# vim:set sts=2 ts=2:
+# vim:set shiftwidth=2:
+-%>