Put the yaml in the tree and call the right file

[mirror/dsa-puppet.git] / templates / motd.erb

diff --git a/templates/motd.erb b/templates/motd.erb
index 0155683..ff2223c 100644 (file)
--- a/templates/motd.erb
+++ b/templates/motd.erb
@@ -1,8 +1,23 @@
+

 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.
+

 <% if File.exists?("/etc/puppet/modules/motd/files/" + fqdn + "/motd.tail") -%>
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 <% if File.exists?("/etc/puppet/modules/motd/files/" + fqdn + "/motd.tail") -%>
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

-<% File.open("/etc/puppet/modules/motd/files/" + fqdn + "/motd.tail").read -%>
+
+<% f = File.open("/etc/puppet/modules/motd/files/" + fqdn + "/motd.tail") -%>
+<%= f.read -%>
+

 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

+
+<% f.close -%>

 <% end -%>
 <% end -%>