From 0a5202f1d48910118d9014ff46d707a15875de1a Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Thu, 23 Apr 2009 00:06:22 +0100 Subject: [PATCH] Some aesthetic fixups Signed-off-by: Stephen Gran --- modules/motd/files/caballero.debian.org/motd.tail | 3 --- modules/motd/files/gluck.debian.org/motd.tail | 2 -- modules/motd/files/master.debian.org/motd.tail | 2 -- modules/motd/files/merkel.debian.org/motd.tail | 2 -- modules/motd/files/pergolesi.debian.org/motd.tail | 2 -- modules/motd/files/voltaire.debian.org/motd.tail | 2 -- templates/motd.erb | 2 ++ 7 files changed, 2 insertions(+), 13 deletions(-) diff --git a/modules/motd/files/caballero.debian.org/motd.tail b/modules/motd/files/caballero.debian.org/motd.tail index 783c1da05..88de63c1e 100644 --- a/modules/motd/files/caballero.debian.org/motd.tail +++ b/modules/motd/files/caballero.debian.org/motd.tail @@ -1,4 +1,3 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ** IMPORTANT WARNING ** @@ -9,8 +8,6 @@ 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. -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -================================================================- | 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 59a09e9a1..4d7646562 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. @@ -6,4 +5,3 @@ partition with /home and /org suffered extensive filesystem corruption. Please see: http://lists.debian.org/debian-devel-announce/2005/04/msg00008.html for more details. -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/modules/motd/files/master.debian.org/motd.tail b/modules/motd/files/master.debian.org/motd.tail index b7131e245..8cdd1a326 100644 --- a/modules/motd/files/master.debian.org/motd.tail +++ b/modules/motd/files/master.debian.org/motd.tail @@ -1,4 +1,3 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ** IMPORTANT WARNING ** @@ -10,4 +9,3 @@ 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 index 39212a8ce..7c532b9a4 100644 --- a/modules/motd/files/merkel.debian.org/motd.tail +++ b/modules/motd/files/merkel.debian.org/motd.tail @@ -1,4 +1,3 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ** IMPORTANT WARNING ** @@ -9,4 +8,3 @@ 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. -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/modules/motd/files/pergolesi.debian.org/motd.tail b/modules/motd/files/pergolesi.debian.org/motd.tail index 99238267c..d77d00ec0 100644 --- a/modules/motd/files/pergolesi.debian.org/motd.tail +++ b/modules/motd/files/pergolesi.debian.org/motd.tail @@ -14,7 +14,6 @@ | evidence of such monitoring to law enforcement officials. | |-----------------------------------------------------------------| -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ** IMPORTANT WARNING ** @@ -25,4 +24,3 @@ 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. -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/modules/motd/files/voltaire.debian.org/motd.tail b/modules/motd/files/voltaire.debian.org/motd.tail index 1d97af7fd..8c23454d0 100644 --- a/modules/motd/files/voltaire.debian.org/motd.tail +++ b/modules/motd/files/voltaire.debian.org/motd.tail @@ -1,4 +1,3 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ** IMPORTANT WARNING ** @@ -9,7 +8,6 @@ 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. -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 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 92af9d756..bf327bb5a 100644 --- a/templates/motd.erb +++ b/templates/motd.erb @@ -2,5 +2,7 @@ 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.tail") -%> +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% <% File.open("/etc/puppet/modules/motd/files/$fqdn/motd.tail").read -%> +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% <% end -%> -- 2.20.1