From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 10 Dec 2013 17:40:34 +0000 (+0100)
Subject: Mess some more with the motd
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=a94d54ea6023cc57c48f490dd83f35fc492ff190;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 7ddb539e9..3d27fc5cf 100644
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -126,15 +126,11 @@ 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 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 " + wrap("Note that this host is _NOT_ being backed up.  If you
-care about your data, run your own backups.")
+  purp += "\n " + wrap("Note that this host is _NOT_ being backed up.  If you care about your data, run your own backups.")
 end
 
 if scope.lookupvar('site::nodeinfo').has_key?('footer')