From 47ce45a559dbf7ff897b6c8b13f0f0614d41163a Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 8 Jan 2014 15:43:54 +0000 Subject: [PATCH] mess with motd wrappig/spacing --- modules/motd/templates/motd.erb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb index 4afe1d374..dcf02fabe 100644 --- a/modules/motd/templates/motd.erb +++ b/modules/motd/templates/motd.erb @@ -13,7 +13,14 @@ 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 ") + 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) @@ -61,7 +68,7 @@ if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose')) else extra += "." end -purp += " " + wrap(extra) +purp += " " + wrap(extra) + "\n" if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('physicalHost')) if ninfo['ldap']['physicalHost'][0] =~ /ganeti/ @@ -136,7 +143,6 @@ end purp -%> - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% <% if @lsbmajdistrelease >= '7' -%> -- 2.20.1