Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  line wrap motd

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 6ac169c4ca088c85967aa57471e17061e1e2d63b..37d9b4fe3d7468de6831702a48735fef0fee9898 100644 (file)
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -5,9 +5,13 @@ is monitored and will be used as evidence for prosecutions.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 <%=
+def wrap(s, width=78)
+      s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n")
+end
+
 purp = ''
 if nodeinfo.has_key?('nameinfo')
-  purp += nodeinfo['nameinfo'] + "\n\n"
+  purp += wrap(nodeinfo['nameinfo']) + "\n\n"
 end
 
 purp += 'Welcome to ' + fqdn