reword it all, by teh luca

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

diff --git a/modules/motd/templates/motd.erb b/modules/motd/templates/motd.erb
index 3160aec..31936b3 100644 (file)
--- a/modules/motd/templates/motd.erb
+++ b/modules/motd/templates/motd.erb
@@ -137,22 +137,18 @@ if scope.lookupvar('::cluster').to_s != 'undefined'
 end
 
 
+if classes.include?("porterbox")
+  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
   purp += "\n Note that this host is _NOT_ being backed up.  If you care about your\n" +
             " data, run your own backups.\n"
 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" +
-    "  *** Clean up behind you! ***\n"
-end
-
-
 if scope.lookupvar('site::nodeinfo').has_key?('footer')
   purp += "\n" + wrap(scope.lookupvar('site::nodeinfo')['footer']) + "\n"
 end