A few more motds

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/motd/files/agnesi.debian.org/motd.tail b/modules/motd/files/agnesi.debian.org/motd.tail
index b8cce60..c95f4f3 100644 (file)
--- a/modules/motd/files/agnesi.debian.org/motd.tail
+++ b/modules/motd/files/agnesi.debian.org/motd.tail
@@ -1,3 +1,3 @@
-agnesi -- Maria Teresa Agnesi (October 17, 1720 – January 19, 1795)
+Maria Teresa Agnesi (October 17, 1720 - January 19, 1795)
 
  Welcome to agnesi.debian.org, the Debian arm porterbox.

diff --git a/modules/motd/files/albeniz.debian.org/motd.tail b/modules/motd/files/albeniz.debian.org/motd.tail
index c201910..fc0d25f 100644 (file)
--- a/modules/motd/files/albeniz.debian.org/motd.tail
+++ b/modules/motd/files/albeniz.debian.org/motd.tail
@@ -1,3 +1,3 @@
-albeniz -- Isaac Manuel Francisco Albéniz i Pascual (May 29, 1860 – May 18, 1909)
+Isaac Manuel Francisco Albéniz i Pascual (May 29, 1860 - May 18, 1909)
 
- Welcome to agricola.debian.org, the Debian alpha porterbox
+ Welcome to albeniz.debian.org, the Debian alpha porterbox

diff --git a/modules/motd/files/ancina.debian.org/motd.tail b/modules/motd/files/ancina.debian.org/motd.tail
index 9e76097..0e5ae0c 100644 (file)
--- a/modules/motd/files/ancina.debian.org/motd.tail
+++ b/modules/motd/files/ancina.debian.org/motd.tail
@@ -1,4 +1,4 @@
-ancina -- Giovanni Giovenale Ancina (19 October 1545 - August 30, 1604)
+Giovanni Giovenale Ancina (19 October 1545 - August 30, 1604)
 
  Welcome to ancina.debian.org, the Debian armel build daemon.
  Please use agricola.debian.org for test builds, debugging etc.

diff --git a/modules/motd/files/arcadelt.debian.org/motd.tail b/modules/motd/files/arcadelt.debian.org/motd.tail
index 5a69184..75bfb54 100644 (file)
--- a/modules/motd/files/arcadelt.debian.org/motd.tail
+++ b/modules/motd/files/arcadelt.debian.org/motd.tail
@@ -1,4 +1,4 @@
-Jacques Arcadelt (also Jacob Arcadelt) (?1507 – October 14, 1568)
+Jacques Arcadelt (also Jacob Arcadelt) (?1507 - October 14, 1568)
 
  Welcome to arcadelt.debian.org, the Debian armel build daemon.
  Please use agricola.debian.org for test builds, debugging etc.

diff --git a/modules/motd/files/argento.debian.org/motd.tail b/modules/motd/files/argento.debian.org/motd.tail
index e9b613b..cd9c2ae 100644 (file)
--- a/modules/motd/files/argento.debian.org/motd.tail
+++ b/modules/motd/files/argento.debian.org/motd.tail
@@ -1,4 +1,4 @@
-Dominick Argento (b. October 27, 1927, York, Pennsylvania)
+Dominick Argento (b. October 27, 1927)
 
  Welcome to argento.debian.org, the Debian armel build daemon.
  Please use agricola.debian.org for test builds, debugging etc.

diff --git a/modules/motd/files/bartok.debian.org/motd.tail b/modules/motd/files/bartok.debian.org/motd.tail
index de406dc..33eb1cb 100644 (file)
--- a/modules/motd/files/bartok.debian.org/motd.tail
+++ b/modules/motd/files/bartok.debian.org/motd.tail
@@ -1,6 +1,5 @@
-Béla Viktor János Bartók (March 25, 1881–September 26, 1945)
+Béla Viktor János Bartók (March 25, 1881 - September 26, 1945)
 
  Welcome to bartok.debian.org, aka backups.debian.org
 
 Documentation: gluck:/org/admin.debian.org/doc/backup.debian.org
---------------------------------------------------------------------------

diff --git a/modules/motd/files/brahms.debian.org/motd.tail b/modules/motd/files/brahms.debian.org/motd.tail
index 716c907..1f84918 100644 (file)
--- a/modules/motd/files/brahms.debian.org/motd.tail
+++ b/modules/motd/files/brahms.debian.org/motd.tail
@@ -1 +1,3 @@
-Johannes Brahms (May 7, 1833 – April 3, 1897)
+Johannes Brahms (May 7, 1833 - April 3, 1897)
+
+ Welcome to brahms.debian.org

diff --git a/modules/motd/files/chopin.debian.org/motd.tail b/modules/motd/files/chopin.debian.org/motd.tail
index ef70d31..d91f5b8 100644 (file)
--- a/modules/motd/files/chopin.debian.org/motd.tail
+++ b/modules/motd/files/chopin.debian.org/motd.tail
@@ -1,3 +1,3 @@
-Frédéric Chopin (1 March 1810 – 17 October 1849)
+Frédéric Chopin (1 March 1810 - 17 October 1849)
 
  Welcome to chopin.debian.org

diff --git a/modules/motd/files/gluck.debian.org/motd.tail b/modules/motd/files/gluck.debian.org/motd.tail
index d76bb7f..3d18960 100644 (file)
--- a/modules/motd/files/gluck.debian.org/motd.tail
+++ b/modules/motd/files/gluck.debian.org/motd.tail
@@ -1,6 +1,4 @@
-In April 2005 this machine suffered a drastic hardware RAID failure and the
-partition with /home and /org suffered extensive filesystem corruption.
+Christoph Willibald Ritter von Gluck (2 July 1714 - 15 November 1787)
 
-Please see:
-  http://lists.debian.org/debian-devel-announce/2005/04/msg00008.html
-for more details.
+ Welcome to gluck.debian.org, hosting cvs.debian.org, popcon.debian.org
+ and www.us.debian.org

diff --git a/modules/motd/files/goedel.debian.org/motd.tail b/modules/motd/files/goedel.debian.org/motd.tail
new file mode 100644 (file)
index 0000000..b645aed
--- /dev/null
+++ b/modules/motd/files/goedel.debian.org/motd.tail
@@ -0,0 +1,3 @@
+Kurt Gödel (April 28, 1906 - January 14, 1978)
+
+ Welcome to goedel.debian.org

diff --git a/modules/motd/files/goetz.debian.org/motd.tail b/modules/motd/files/goetz.debian.org/motd.tail
new file mode 100644 (file)
index 0000000..f19639e
--- /dev/null
+++ b/modules/motd/files/goetz.debian.org/motd.tail
@@ -0,0 +1,4 @@
+Hermann Gustav Goetz (December 7, 1840 - December 3, 1876)
+
+ Welcome to goetz.debian.org, the Debian alpha buildd
+ Please use albeniz.debian.org for test builds, debugging etc.

diff --git a/modules/motd/files/handel.debian.org/motd.tail b/modules/motd/files/handel.debian.org/motd.tail
new file mode 100644 (file)
index 0000000..19ea171
--- /dev/null
+++ b/modules/motd/files/handel.debian.org/motd.tail
@@ -0,0 +1,3 @@
+Georg Friedrich Händel (23 February 1685 – 14 April 1759)
+
+  Welcome to handel.debian.org, aka puppet.debian.org

diff --git a/modules/motd/files/kassia.debian.org/motd.tail b/modules/motd/files/kassia.debian.org/motd.tail
new file mode 100644 (file)
index 0000000..88789ef
--- /dev/null
+++ b/modules/motd/files/kassia.debian.org/motd.tail
@@ -0,0 +1,3 @@
+Kassia (between 805 and 810 - bef. 867)
+
+ Welcome to kassia.debian.org, security mirror

diff --git a/templates/motd.erb b/templates/motd.erb
index 6840777..ff2223c 100644 (file)
--- a/templates/motd.erb
+++ b/templates/motd.erb
@@ -13,8 +13,11 @@ 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 -%>