X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=templates%2Fmotd.erb;h=6840777acbcac5b7a93c42f8a90320f26885248c;hb=1b5981aee978aaf252dca412ac8c203d3cfcb863;hp=c3132a52b7d0df901f4e79e11c3e9497a2e10450;hpb=7e6cc84e7a484ba28988eb4acfa8fbd629a3ca82;p=mirror%2Fdsa-puppet.git

diff --git a/templates/motd.erb b/templates/motd.erb
index c3132a52b..6840777ac 100644
--- a/templates/motd.erb
+++ b/templates/motd.erb
@@ -1,6 +1,20 @@
+
 This device is for authorized users only.  All traffic on this device
 is monitored and will be used as evidence for prosecutions.
 
-<% if File.exists?("/etc/puppet/modules/motd/files/$fqdn/motd-footer") -%>
-<% File.open("/etc/puppet/modules/motd/files/$fqdn/motd-footer").read -%>
+** 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.
+
+<% if File.exists?("/etc/puppet/modules/motd/files/" + fqdn + "/motd.tail") -%>
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+<% f = File.open("/etc/puppet/modules/motd/files/" + fqdn + "/motd.tail") -%>
+<%= f.read -%>
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+<% f.close -%>
 <% end -%>