Some aesthetic 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 783c1da05bcdd123a5eb696d6aaa9fd83d752e5c..88de63c1e90ddbff5dbf076e51f8eb0ce9ffbe9a 100644 (file)
--- 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 59a09e9a153fc3419b3548907ae02f0af22dbe47..4d764656297bcb74227d3636245eb2c51621eddb 100644 (file)
--- 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 b7131e245f299f17778f03d8d6640bb2fa741d7e..8cdd1a326faa248239ea2c2389fa738e53f6c977 100644 (file)
--- 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 39212a8cea9bff9088f9f39ac794c8babef1c734..7c532b9a4c2a3bf4b687665e008dcd0b19858533 100644 (file)
--- 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 99238267c91e11cdde4a384e53f2a02e01790d1e..d77d00ec03cc376c1faed5a3d7d67e5cfa553607 100644 (file)
--- 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 1d97af7fd9d03bb759886aebfb16908645ce0d52..8c23454d05fae00d509f0ce45b5c745659038208 100644 (file)
--- 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 92af9d756d2aa24bfe3a0443b7ef582e50e66c73..bf327bb5aa1046b8f81c9cfbc3cf3caf37a3e964 100644 (file)
--- 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 -%>