spacing

[dsa-puppet.git] / modules / motd / templates / motd.erb

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 64e1b2a95200a178aa9e626d0049c21d6c7923cd..b371a901a86bdc1eb2d9e9e471f641a97a61a3a5 100644 (file)
--- 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"
 
@@ -138,13 +138,10 @@ end
 
 
 if classes.include?("porterbox")
-  purp += "\nPlease clean up any schroots after you are done using them.  Please also\n" +
-    "remove any build and source trees in your home directory once you no longer\n" +
-    "need them.  Disk space on porter machines often is scarce.  If it becomes\n" +
-    "necessary we will delete your entire home directory without warning, but this\n" +
-    "really implies that you have been misusing resources.  We would prefer this\n" +
-    "not become necessary.\n" +
-    "\n  *** Clean up after yourself! ***\n"
+  purp += "\n Disk space on porter boxes is often limited.  Please respect your fellow\n" +
+           " porters by cleaning up after yourself by deleting schroots and source/build\n" +
+           " trees in your $HOME, as soon as feasible.  DSA reserves the right to recover\n" +
+           " disk space as necessary.\n"
 end
 
 if ninfo['not-bacula-client'] then