projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6fa7bcd
)
spacing
author
Peter Palfrader
<peter@palfrader.org>
Tue, 10 Dec 2013 17:02:16 +0000
(18:02 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Tue, 10 Dec 2013 17:02:16 +0000
(18:02 +0100)
modules/motd/templates/motd.erb
patch
|
blob
|
history
diff --git
a/modules/motd/templates/motd.erb
b/modules/motd/templates/motd.erb
index
d52927e
..
64e1b2a
100644
(file)
--- a/
modules/motd/templates/motd.erb
+++ b/
modules/motd/templates/motd.erb
@@
-137,11
+137,6
@@
if scope.lookupvar('::cluster').to_s != 'undefined'
end
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" +
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" +
@@
-149,9
+144,13
@@
if classes.include?("porterbox")
"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" +
"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 after yourself! ***\n"
+ "
\n
*** Clean up after yourself! ***\n"
end
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 scope.lookupvar('site::nodeinfo').has_key?('footer')
purp += "\n" + wrap(scope.lookupvar('site::nodeinfo')['footer']) + "\n"
if scope.lookupvar('site::nodeinfo').has_key?('footer')
purp += "\n" + wrap(scope.lookupvar('site::nodeinfo')['footer']) + "\n"