From: Peter Palfrader Date: Tue, 10 Dec 2013 17:26:37 +0000 (+0100) Subject: spacing X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=240934800b828596de501c10bbd3008e01e1d9b2 spacing --- diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb index 0b459c18..b371a901 100644 --- a/modules/motd/templates/motd.erb +++ b/modules/motd/templates/motd.erb @@ -24,12 +24,12 @@ end purp = '' if scope.lookupvar('site::nodeinfo').has_key?('nameinfo') - purp += wrap(scope.lookupvar('site::nodeinfo')['nameinfo']) + "\n\n" + purp += " " + wrap(scope.lookupvar('site::nodeinfo')['nameinfo']) + "\n" end ninfo = scope.lookupvar('site::nodeinfo') -purp += 'Welcome to ' + fqdn +purp += ' Welcome to ' + fqdn if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('purpose')) p = scope.lookupvar('site::nodeinfo')['ldap']['purpose'].clone() extra = '' @@ -84,11 +84,11 @@ if (scope.lookupvar('site::nodeinfo')['ldap'].has_key?('physicalHost')) else phys_host = 'physical host' end - purp += wrap("This virtual server runs on the #{phys_host} #{ninfo['ldap']['physicalHost'][0]}, " + + purp += wrap(" This virtual server runs on the #{phys_host} #{ninfo['ldap']['physicalHost'][0]}, " + "which is hosted at #{ninfo['hoster']['longname']}." ) elsif scope.lookupvar('site::nodeinfo')['hoster']['name'] - purp += wrap("This server is hosted at #{ninfo['hoster']['longname']}.") + purp += wrap(" This server is hosted at #{ninfo['hoster']['longname']}.") end @@ -116,7 +116,7 @@ end if scope.lookupvar('::cluster').to_s != 'undefined' - purp += "\nThis server is a node in ganeti 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"