X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=56328234f210df15ccef8e7a9a97e8a0f996d2ac;hb=31a3a9671cd1bc17dba562dea642c62aff3bc7ef;hp=3d27fc5cf597c9e3369738c1faea9f33964a7293;hpb=a94d54ea6023cc57c48f490dd83f35fc492ff190;p=mirror%2Fdsa-puppet.git

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 3d27fc5cf..56328234f 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -9,11 +9,18 @@ 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>.
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 <%=
 def wrap(s, width=78)
-      s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n ")
+  #s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n ")
+  s.split("\n").map{ |x|
+    if (x.length > width) then
+      #x.gsub!(/(.{1,#{width}}) +(?=\S)/, "\\1\n ")
+      x.gsub!(/(.{1,#{width}})( +|\Z)/, "\\1\n ")
+    end
+    x
+  }.join("\n")+"\n"
 end
 
 def markup(l)
@@ -35,36 +42,33 @@ end
 
 ninfo = scope.lookupvar('site::nodeinfo')
 
-purp += ' Welcome to ' + fqdn
+extra = 'Welcome to ' + fqdn
 if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose'))
   p = scope.lookupvar('site::nodeinfo')['ldap']['purpose'].clone()
-  extra = ''
+  entries = ""
 
   if p.delete('buildd')
-    extra += ", the Debian #{arch} build daemon."
+    entries += ", the Debian #{arch} build daemon"
   end
   if p.delete('porterbox') or classes.include?("porterbox")
-    extra += ", the Debian #{arch} porterbox. See\n"+
-    extra += " <URL:http://dsa.debian.org/doc/schroot/> for a brief schroot tutorial."
+    entries += ", the Debian #{arch} porterbox"
   end
 
   if p.size() > 0
-    extra += (extra == "") ? ", " : " Also"
-    extra +="used for the following services:\n"
+    entries += (entries == "") ? ", " : ".  Also"
+    entries +="used for the following services:\n"
     scope.lookupvar('site::nodeinfo')['ldap']['purpose'].sort.each do |l|
       l = markup(l)
-      extra += "\t#{l}\n"
+      entries += "\t#{l}\n"
     end
   else
-    extra += ".\n"
+    entries += ".\n"
   end
-
-  purp += extra
+  extra += entries
 else
-  purp += ".\n"
+  extra += "."
 end
-
-purp += "\n"
+purp += " " + wrap(extra) + "\n"
 
 if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('physicalHost'))
   if ninfo['ldap']['physicalHost'][0] =~ /ganeti/
@@ -103,16 +107,16 @@ unless vms.empty?
 end
 
 
-if scope.lookupvar('::cluster').to_s != 'undefined'
+if scope.lookupvar('::cluster')
   purp += "\n This server is a node in ganeti cluster: "
   purp += scope.lookupvar('::cluster').to_s + ":\n"
-  purp += "\t" + scope.lookupvar('::cluster_nodes').to_s.split.sort.map{ |x| x.split('.')[0] }.join(", ") + ".\n"
+  purp += "\t" + scope.lookupvar('::cluster_nodes').split.sort.map{ |x| x.split('.')[0] }.join(", ") + ".\n"
 
   if @lsbmajdistrelease >= '7'
     purp += ""
     purp += "\tCurrently the master node is $(cat /var/lib/ganeti/ssconf_master_node).\n"
   end
-  #nodes = scope.lookupvar('::cluster_nodes').to_s.split.sort
+  #nodes = scope.lookupvar('::cluster_nodes').sort
   #nodes.each do |node|
   #  purp += "\t" + node + "\n"
   #end
@@ -126,7 +130,7 @@ end
 
 
 if classes.include?("porterbox")
-  purp += "\n " + wrap("Disk space on porter boxes is often limited.  Please respect your fellow porters by cleaning up after yourself by deleting schroots and source/build trees in your $HOME, as soon as feasible.  DSA reserves the right to recover disk space as necessary.") + "\n"
+  purp += "\n " + wrap("Disk space on porter boxes is often limited.  Please respect your fellow porters by cleaning up after yourself and deleting schroots and source/build trees in your ~ as soon as feasible.  DSA reserves the right to recover disk space as necessary.  See <URL:http://dsa.debian.org/doc/schroot/> for a brief tutorial on using schroot.  There may be chroots for architectures other than #{arch} available, please list available chroots to check.")
 end
 
 if ninfo['not-bacula-client'] then
@@ -139,8 +143,7 @@ end
 
 purp
 -%>
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 <% if @lsbmajdistrelease >= '7' -%>
 EOD