X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=templates%2Fmotd.erb;h=ff2223c395c501c7c3f3063c416321508f366782;hb=286d653b921ffe7927e7db247b186663e9fa9c05;hp=c8928b2d5ed35efe7d436b71c715dba408903f1d;hpb=bb078c190ab2c062613d4f26d105f682269af5b3;p=mirror%2Fdsa-puppet.git

diff --git a/templates/motd.erb b/templates/motd.erb
index c8928b2d5..ff2223c39 100644
--- a/templates/motd.erb
+++ b/templates/motd.erb
@@ -1,6 +1,23 @@
+
 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 -%>