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 (from parent 1:
4f48c53
)
Mess some more with the motd
author
Peter Palfrader
<peter@palfrader.org>
Tue, 10 Dec 2013 17:38:26 +0000
(18:38 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Tue, 10 Dec 2013 17:38:26 +0000
(18:38 +0100)
modules/motd/templates/motd.erb
patch
|
blob
|
history
diff --git
a/modules/motd/templates/motd.erb
b/modules/motd/templates/motd.erb
index
3a0dfba
..
0592e26
100644
(file)
--- a/
modules/motd/templates/motd.erb
+++ b/
modules/motd/templates/motd.erb
@@
-13,7
+13,7
@@
this machine you agree to abide by the Debian Machines Usage Policies
<%=
def wrap(s, width=78)
<%=
def wrap(s, width=78)
- s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n")
+ s.gsub(/(.{1,#{width}})(\s+|\Z)/, "\\1\n
")
end
def markup(l)
end
def markup(l)
@@
-126,15
+126,15
@@
end
if classes.include?("porterbox")
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"
+ purp += "\n
" + wrap("Disk space on porter boxes is often limited. Please
+respect your fellow porters by cleaning up after yourself by deleting
+schroots and source/build trees in your $HOME, as soon as feasible. DSA
+
reserves the right to recover disk space as necessary.") + "
\n"
end
if ninfo['not-bacula-client'] then
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"
+ purp += "\n
" + wrap("Note that this host is _NOT_ being backed up. If you
+
care about your data, run your own backups.") + "
\n"
end
if scope.lookupvar('site::nodeinfo').has_key?('footer')
end
if scope.lookupvar('site::nodeinfo').has_key?('footer')