From: Stephen Gran <steve@lobefin.net>
Date: Wed, 22 Apr 2009 23:58:37 +0000 (+0100)
Subject: Some more motd fixups
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=24b008b66501d337f68694bd6385a16f0a3db488;p=mirror%2Fdsa-puppet.git

Some more motd fixups
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/motd/files/caballero.debian.org/motd.tail b/modules/motd/files/caballero.debian.org/motd.tail
index 88de63c1e..a70eca323 100644
--- a/modules/motd/files/caballero.debian.org/motd.tail
+++ b/modules/motd/files/caballero.debian.org/motd.tail
@@ -1,13 +1,3 @@
- 
-** 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.
-
 -================================================================-
 | Welcome to caballero.debian.org, the Debian ia64 build daemon. |
 | Please use merulo.debian.org for test builds, debugging etc.   |
diff --git a/modules/motd/files/gluck.debian.org/motd.tail b/modules/motd/files/gluck.debian.org/motd.tail
index 4d7646562..d76bb7f59 100644
--- a/modules/motd/files/gluck.debian.org/motd.tail
+++ b/modules/motd/files/gluck.debian.org/motd.tail
@@ -1,4 +1,3 @@
-** IMPORTANT WARNING **
 In April 2005 this machine suffered a drastic hardware RAID failure and the
 partition with /home and /org suffered extensive filesystem corruption.
 
diff --git a/modules/motd/files/master.debian.org/motd.tail b/modules/motd/files/master.debian.org/motd.tail
index 8cdd1a326..ea782e656 100644
--- a/modules/motd/files/master.debian.org/motd.tail
+++ b/modules/motd/files/master.debian.org/motd.tail
@@ -1,11 +1 @@
-
-** IMPORTANT WARNING **
-
-Please read:
-
-http://lists.debian.org/debian-devel-announce/2003/debian-devel-announce-200312>
-before doing anything on these machines - especially the "What to do
-when you can login" section.
-
 Hardware upgraded September 24, 2006.
-
diff --git a/modules/motd/files/merkel.debian.org/motd.tail b/modules/motd/files/merkel.debian.org/motd.tail
deleted file mode 100644
index 7c532b9a4..000000000
--- a/modules/motd/files/merkel.debian.org/motd.tail
+++ /dev/null
@@ -1,10 +0,0 @@
-
-** 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.
-
diff --git a/modules/motd/files/pergolesi.debian.org/motd.tail b/modules/motd/files/pergolesi.debian.org/motd.tail
index d77d00ec0..85928afa9 100644
--- a/modules/motd/files/pergolesi.debian.org/motd.tail
+++ b/modules/motd/files/pergolesi.debian.org/motd.tail
@@ -14,13 +14,3 @@
 | evidence of such monitoring to law enforcement officials.       |
 |-----------------------------------------------------------------|
 
-
-** 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.
-
diff --git a/modules/motd/files/voltaire.debian.org/motd.tail b/modules/motd/files/voltaire.debian.org/motd.tail
index 8c23454d0..6e1f1b7e7 100644
--- a/modules/motd/files/voltaire.debian.org/motd.tail
+++ b/modules/motd/files/voltaire.debian.org/motd.tail
@@ -1,13 +1,3 @@
 
-** 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.
-
-
 This machine is primarily a build daemon.  Please do not start builds here
 while the build daemon is busy.
diff --git a/templates/motd.erb b/templates/motd.erb
index a0a7a7255..27d59d819 100644
--- a/templates/motd.erb
+++ b/templates/motd.erb
@@ -1,6 +1,15 @@
 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") -%>
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 <% f = File.open("/etc/puppet/modules/motd/files/" + fqdn + "/motd.tail") -%>