X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmotd%2Ftemplates%2Fmotd.erb;h=56328234f210df15ccef8e7a9a97e8a0f996d2ac;hb=4a017e0932f8197b80c0791b345f55c40955596d;hp=4afe1d3743a691eabea8e43024f1767524b86445;hpb=06aacdf2dca1cc57b6327ac7846162e74811a3d7;p=mirror%2Fdsa-puppet.git
diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 4afe1d374..56328234f 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/
@@ -100,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
@@ -123,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 and deleting schroots and source/build trees in your ~ as soon as feasible. DSA reserves the right to recover disk space as necessary. See for a brief tutorial on using schroot.")
+ 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 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
@@ -136,7 +143,6 @@ end
purp
-%>
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<% if @lsbmajdistrelease >= '7' -%>