From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 10 Dec 2013 17:38:26 +0000 (+0100)
Subject: Mess some more with the motd
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c254fb082cb08ad4dbb1321f77b429f594a54405;hp=4f48c5379ce98f842a8a8f87325eaf117be44f04;p=mirror%2Fdsa-puppet.git

Mess some more with the motd
---

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 3a0dfba30..0592e26c1 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -13,7 +13,7 @@ this machine you agree to abide by the Debian Machines Usage Policies
 
 <%=
 def wrap(s, width=78)
-      s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n")
+      s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n ")
 end
 
 def markup(l)
@@ -126,15 +126,15 @@ end
 
 
 if classes.include?("porterbox")
-  purp += "\n Disk space on porter boxes is often limited.  Please respect your fellow\n" +
-           " porters by cleaning up after yourself by deleting schroots and source/build\n" +
-           " trees in your $HOME, as soon as feasible.  DSA reserves the right to recover\n" +
-           " 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 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"
 end
 
 if ninfo['not-bacula-client'] then
-  purp += "\n Note that this host is _NOT_ being backed up.  If you care about your\n" +
-            " data, run your own backups.\n"
+  purp += "\n" + wrap("Note that this host is _NOT_ being backed up.  If you
+care about your data, run your own backups.") + "\n"
 end
 
 if scope.lookupvar('site::nodeinfo').has_key?('footer')