projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...
[mirror/dsa-puppet.git]
/
modules
/
motd
/
templates
/
motd.erb
diff --git
a/modules/motd/templates/motd.erb
b/modules/motd/templates/motd.erb
index
b186dc9
..
6ac169c
100644
(file)
--- a/
modules/motd/templates/motd.erb
+++ b/
modules/motd/templates/motd.erb
@@
-1,15
+1,7
@@
+
This device is for authorized users only. All traffic on this device
is monitored and will be used as evidence for prosecutions.
This device is for authorized users only. All traffic on this device
is monitored and will be used as evidence for prosecutions.
-** IMPORTANT WARNING **
-
-Please read:
-
-http://lists.debian.org/debian-devel-announce/2003/debian-devel-announce-200312/msg00001.html
-
-before doing anything on these machines - especially the "What to do
-when you can login" section.
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<%=
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
<%=
@@
-44,6
+36,8
@@
if (nodeinfo['ldap'].at(0)) and (nodeinfo['ldap'][0].has_key?('purpose'))
purp += "\t" + l + "\n"
end
end
purp += "\t" + l + "\n"
end
end
+else
+ purp += "\n"
end
if nodeinfo.has_key?('footer')
end
if nodeinfo.has_key?('footer')
@@
-53,3
+47,4
@@
purp
-%>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+