From 22446678cf567eb2c458a4dd30ce9c0282f4ad33 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 26 Apr 2009 16:43:50 +0100 Subject: [PATCH] Move to the new motd generation setup Signed-off-by: Stephen Gran --- manifests/site.pp | 3 +- modules/debian-org/misc/local.yaml | 4 ++ .../motd/files/agnesi.debian.org/motd.tail | 3 - .../motd/files/agricola.debian.org/motd.tail | 1 - .../motd/files/albeniz.debian.org/motd.tail | 3 - .../motd/files/allegri.debian.org/motd.tail | 2 - .../motd/files/ancina.debian.org/motd.tail | 4 -- .../motd/files/arcadelt.debian.org/motd.tail | 4 -- .../motd/files/argento.debian.org/motd.tail | 4 -- modules/motd/files/ball.debian.org/motd.tail | 1 - .../motd/files/bartok.debian.org/motd.tail | 5 -- .../motd/files/brahms.debian.org/motd.tail | 3 - .../motd/files/caballero.debian.org/motd.tail | 2 - .../motd/files/carver.debian.org/motd.tail | 3 - .../motd/files/chopin.debian.org/motd.tail | 3 - .../motd/files/dijkstra.debian.org/motd.tail | 3 - modules/motd/files/gluck.debian.org/motd.tail | 4 -- .../motd/files/goedel.debian.org/motd.tail | 3 - modules/motd/files/goetz.debian.org/motd.tail | 4 -- .../motd/files/handel.debian.org/motd.tail | 3 - .../motd/files/kassia.debian.org/motd.tail | 3 - .../motd/files/klecker.debian.org/motd.tail | 4 -- .../motd/files/lafayette.debian.org/motd.tail | 4 -- .../motd/files/lebrun.debian.org/motd.tail | 6 -- .../motd/files/mahler.debian.org/motd.tail | 3 - modules/motd/files/malo.debian.org/motd.tail | 2 - .../motd/files/master.debian.org/motd.tail | 2 - modules/motd/files/mayer.debian.org/motd.tail | 4 -- modules/motd/files/mayr.debian.org/motd.tail | 4 -- .../motd/files/merkel.debian.org/motd.tail | 5 -- .../motd/files/merulo.debian.org/motd.tail | 3 - .../motd/files/morales.debian.org/motd.tail | 3 - modules/motd/files/mundy.debian.org/motd.tail | 4 -- .../motd/files/murphy.debian.org/motd.tail | 2 - modules/motd/files/paer.debian.org/motd.tail | 3 - .../motd/files/penalosa.debian.org/motd.tail | 4 -- .../motd/files/pergolesi.debian.org/motd.tail | 3 - modules/motd/files/ravel.debian.org/motd.tail | 3 - .../motd/files/samosa.debian.org/motd.tail | 4 -- .../motd/files/schroeder.debian.org/motd.tail | 4 -- modules/motd/files/verdi.debian.org/motd.tail | 3 - .../motd/files/voltaire.debian.org/motd.tail | 3 - modules/motd/manifests/new.pp | 6 -- templates/motd-new.erb | 55 ------------------- templates/motd.erb | 46 +++++++++++++--- 45 files changed, 44 insertions(+), 201 deletions(-) delete mode 100644 modules/motd/files/agnesi.debian.org/motd.tail delete mode 100644 modules/motd/files/agricola.debian.org/motd.tail delete mode 100644 modules/motd/files/albeniz.debian.org/motd.tail delete mode 100644 modules/motd/files/allegri.debian.org/motd.tail delete mode 100644 modules/motd/files/ancina.debian.org/motd.tail delete mode 100644 modules/motd/files/arcadelt.debian.org/motd.tail delete mode 100644 modules/motd/files/argento.debian.org/motd.tail delete mode 100644 modules/motd/files/ball.debian.org/motd.tail delete mode 100644 modules/motd/files/bartok.debian.org/motd.tail delete mode 100644 modules/motd/files/brahms.debian.org/motd.tail delete mode 100644 modules/motd/files/caballero.debian.org/motd.tail delete mode 100644 modules/motd/files/carver.debian.org/motd.tail delete mode 100644 modules/motd/files/chopin.debian.org/motd.tail delete mode 100644 modules/motd/files/dijkstra.debian.org/motd.tail delete mode 100644 modules/motd/files/gluck.debian.org/motd.tail delete mode 100644 modules/motd/files/goedel.debian.org/motd.tail delete mode 100644 modules/motd/files/goetz.debian.org/motd.tail delete mode 100644 modules/motd/files/handel.debian.org/motd.tail delete mode 100644 modules/motd/files/kassia.debian.org/motd.tail delete mode 100644 modules/motd/files/klecker.debian.org/motd.tail delete mode 100644 modules/motd/files/lafayette.debian.org/motd.tail delete mode 100644 modules/motd/files/lebrun.debian.org/motd.tail delete mode 100644 modules/motd/files/mahler.debian.org/motd.tail delete mode 100644 modules/motd/files/malo.debian.org/motd.tail delete mode 100644 modules/motd/files/master.debian.org/motd.tail delete mode 100644 modules/motd/files/mayer.debian.org/motd.tail delete mode 100644 modules/motd/files/mayr.debian.org/motd.tail delete mode 100644 modules/motd/files/merkel.debian.org/motd.tail delete mode 100644 modules/motd/files/merulo.debian.org/motd.tail delete mode 100644 modules/motd/files/morales.debian.org/motd.tail delete mode 100644 modules/motd/files/mundy.debian.org/motd.tail delete mode 100644 modules/motd/files/murphy.debian.org/motd.tail delete mode 100644 modules/motd/files/paer.debian.org/motd.tail delete mode 100644 modules/motd/files/penalosa.debian.org/motd.tail delete mode 100644 modules/motd/files/pergolesi.debian.org/motd.tail delete mode 100644 modules/motd/files/ravel.debian.org/motd.tail delete mode 100644 modules/motd/files/samosa.debian.org/motd.tail delete mode 100644 modules/motd/files/schroeder.debian.org/motd.tail delete mode 100644 modules/motd/files/verdi.debian.org/motd.tail delete mode 100644 modules/motd/files/voltaire.debian.org/motd.tail delete mode 100644 modules/motd/manifests/new.pp delete mode 100644 templates/motd-new.erb diff --git a/manifests/site.pp b/manifests/site.pp index 2e636b58e..c8d8cd5eb 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -19,6 +19,7 @@ node default { include debian-org include monit include samhain + include motd $nodeinfo = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml") @@ -36,11 +37,9 @@ node default { case $hostname { spohr: { include nagios::server - include motd::new } default: { include nagios::client - include motd } } diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index a16abe965..6db397c06 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -31,5 +31,9 @@ nameinfo: schroeder.debian.org: Hermann Schroeder (1904-1984), German composer and conductor footer: bartok.debian.org: "Documentation: gluck:/org/admin.debian.org/doc/backup.debian.org" + lebrun.debian.org: "- This host is using an iptables firewall. See /etc/rc.boot/firewall{,6}" + schroeder.debian.org: "- This host is using an iptables firewall. See /etc/rc.boot/firewall{,6}" + verdi.debian.org: "- This host is using an iptables firewall. See /etc/ferm/ferm.conf" + zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]" --- diff --git a/modules/motd/files/agnesi.debian.org/motd.tail b/modules/motd/files/agnesi.debian.org/motd.tail deleted file mode 100644 index c95f4f386..000000000 --- a/modules/motd/files/agnesi.debian.org/motd.tail +++ /dev/null @@ -1,3 +0,0 @@ -Maria Teresa Agnesi (October 17, 1720 - January 19, 1795) - - Welcome to agnesi.debian.org, the Debian arm porterbox. diff --git a/modules/motd/files/agricola.debian.org/motd.tail b/modules/motd/files/agricola.debian.org/motd.tail deleted file mode 100644 index a3c9baa8f..000000000 --- a/modules/motd/files/agricola.debian.org/motd.tail +++ /dev/null @@ -1 +0,0 @@ - Welcome to agricola.debian.org, the Debian armel porterbox diff --git a/modules/motd/files/albeniz.debian.org/motd.tail b/modules/motd/files/albeniz.debian.org/motd.tail deleted file mode 100644 index fc0d25f47..000000000 --- a/modules/motd/files/albeniz.debian.org/motd.tail +++ /dev/null @@ -1,3 +0,0 @@ -Isaac Manuel Francisco Albéniz i Pascual (May 29, 1860 - May 18, 1909) - - Welcome to albeniz.debian.org, the Debian alpha porterbox diff --git a/modules/motd/files/allegri.debian.org/motd.tail b/modules/motd/files/allegri.debian.org/motd.tail deleted file mode 100644 index 8f515055d..000000000 --- a/modules/motd/files/allegri.debian.org/motd.tail +++ /dev/null @@ -1,2 +0,0 @@ - Welcome to allegri.debian.org, the Debian armel build daemon. - Please use agricola.debian.org for test builds, debugging etc. diff --git a/modules/motd/files/ancina.debian.org/motd.tail b/modules/motd/files/ancina.debian.org/motd.tail deleted file mode 100644 index 0e5ae0c1a..000000000 --- a/modules/motd/files/ancina.debian.org/motd.tail +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 75bfb54db..000000000 --- a/modules/motd/files/arcadelt.debian.org/motd.tail +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index cd9c2ae2b..000000000 --- a/modules/motd/files/argento.debian.org/motd.tail +++ /dev/null @@ -1,4 +0,0 @@ -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/ball.debian.org/motd.tail b/modules/motd/files/ball.debian.org/motd.tail deleted file mode 100644 index aa3bdf2f5..000000000 --- a/modules/motd/files/ball.debian.org/motd.tail +++ /dev/null @@ -1 +0,0 @@ - Welcome to ball.debian.org diff --git a/modules/motd/files/bartok.debian.org/motd.tail b/modules/motd/files/bartok.debian.org/motd.tail deleted file mode 100644 index 33eb1cbea..000000000 --- a/modules/motd/files/bartok.debian.org/motd.tail +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 1f849185e..000000000 --- a/modules/motd/files/brahms.debian.org/motd.tail +++ /dev/null @@ -1,3 +0,0 @@ -Johannes Brahms (May 7, 1833 - April 3, 1897) - - Welcome to brahms.debian.org diff --git a/modules/motd/files/caballero.debian.org/motd.tail b/modules/motd/files/caballero.debian.org/motd.tail deleted file mode 100644 index 1df123d2f..000000000 --- a/modules/motd/files/caballero.debian.org/motd.tail +++ /dev/null @@ -1,2 +0,0 @@ - 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/carver.debian.org/motd.tail b/modules/motd/files/carver.debian.org/motd.tail deleted file mode 100644 index 5a6a1da87..000000000 --- a/modules/motd/files/carver.debian.org/motd.tail +++ /dev/null @@ -1,3 +0,0 @@ -Robert Carver (ca.1485 – ca.1570) - - Welcome to carver.debian.org, bugs and packages web frontend diff --git a/modules/motd/files/chopin.debian.org/motd.tail b/modules/motd/files/chopin.debian.org/motd.tail deleted file mode 100644 index d91f5b817..000000000 --- a/modules/motd/files/chopin.debian.org/motd.tail +++ /dev/null @@ -1,3 +0,0 @@ -Frédéric Chopin (1 March 1810 - 17 October 1849) - - Welcome to chopin.debian.org diff --git a/modules/motd/files/dijkstra.debian.org/motd.tail b/modules/motd/files/dijkstra.debian.org/motd.tail deleted file mode 100644 index 101d3d27b..000000000 --- a/modules/motd/files/dijkstra.debian.org/motd.tail +++ /dev/null @@ -1,3 +0,0 @@ -Lowell Dijkstra (b.1952) - - Welcome to dijkstra.debian.org, kvm host diff --git a/modules/motd/files/gluck.debian.org/motd.tail b/modules/motd/files/gluck.debian.org/motd.tail deleted file mode 100644 index 3d189605e..000000000 --- a/modules/motd/files/gluck.debian.org/motd.tail +++ /dev/null @@ -1,4 +0,0 @@ -Christoph Willibald Ritter von Gluck (2 July 1714 - 15 November 1787) - - 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 deleted file mode 100644 index b645aed47..000000000 --- a/modules/motd/files/goedel.debian.org/motd.tail +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 0bbdb453c..000000000 --- a/modules/motd/files/goetz.debian.org/motd.tail +++ /dev/null @@ -1,4 +0,0 @@ -Hermann Gustav Goetz (December 7, 1840 - December 3, 1876) - - Welcome to goetz.debian.org, the Debian alpha build daemon - 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 deleted file mode 100644 index 19ea1714c..000000000 --- a/modules/motd/files/handel.debian.org/motd.tail +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 88789effd..000000000 --- a/modules/motd/files/kassia.debian.org/motd.tail +++ /dev/null @@ -1,3 +0,0 @@ -Kassia (between 805 and 810 - bef. 867) - - Welcome to kassia.debian.org, security mirror diff --git a/modules/motd/files/klecker.debian.org/motd.tail b/modules/motd/files/klecker.debian.org/motd.tail deleted file mode 100644 index bce64d65c..000000000 --- a/modules/motd/files/klecker.debian.org/motd.tail +++ /dev/null @@ -1,4 +0,0 @@ -Dedicated to Joel 'Espy' Klecker (1979 - July 11, 2000) - - Welcome to klecker.debian.org, serving archive.debian.org, - www.debian.org and security-master.debian.org diff --git a/modules/motd/files/lafayette.debian.org/motd.tail b/modules/motd/files/lafayette.debian.org/motd.tail deleted file mode 100644 index b1372deaa..000000000 --- a/modules/motd/files/lafayette.debian.org/motd.tail +++ /dev/null @@ -1,4 +0,0 @@ -Eugenie Lafayette - - Welcome to lafayette.debian.org, the Debian hppa build daemon - Please use paer.debian.org for test builds, debugging etc. diff --git a/modules/motd/files/lebrun.debian.org/motd.tail b/modules/motd/files/lebrun.debian.org/motd.tail deleted file mode 100644 index 20b91394c..000000000 --- a/modules/motd/files/lebrun.debian.org/motd.tail +++ /dev/null @@ -1,6 +0,0 @@ -Francesca Lebrun (March 24, 1756 - May 14, 1791) - - - This host is using an iptables firewall. See /etc/rc.boot/firewall{,6} - - Welcome to lebrun.debian.org, the Debian sparc build daemon - Please use smetana.debian.org for test builds, debugging etc. diff --git a/modules/motd/files/mahler.debian.org/motd.tail b/modules/motd/files/mahler.debian.org/motd.tail deleted file mode 100644 index b15f659be..000000000 --- a/modules/motd/files/mahler.debian.org/motd.tail +++ /dev/null @@ -1,3 +0,0 @@ -Gustav Mahler (7 July 1860 – 18 May 1911) - - Welcome to mahler.debian.org, the Debian mips porterbox diff --git a/modules/motd/files/malo.debian.org/motd.tail b/modules/motd/files/malo.debian.org/motd.tail deleted file mode 100644 index acc4c275f..000000000 --- a/modules/motd/files/malo.debian.org/motd.tail +++ /dev/null @@ -1,2 +0,0 @@ - Welcome to malo.debian.org, the Debian powerpc build daemon. - Please use pescetti.debian.org for test builds, debugging etc. diff --git a/modules/motd/files/master.debian.org/motd.tail b/modules/motd/files/master.debian.org/motd.tail deleted file mode 100644 index a0383e9fd..000000000 --- a/modules/motd/files/master.debian.org/motd.tail +++ /dev/null @@ -1,2 +0,0 @@ - Welcome to master.debian.org, serving @debian.org mail service, - packages.qa.debian.org, and vote.debian.org diff --git a/modules/motd/files/mayer.debian.org/motd.tail b/modules/motd/files/mayer.debian.org/motd.tail deleted file mode 100644 index 07eb3aca0..000000000 --- a/modules/motd/files/mayer.debian.org/motd.tail +++ /dev/null @@ -1,4 +0,0 @@ -Martin Mayer - - Welcome to mayer.debian.org, the Debian mipsel build daemon. - Please use morales.debian.org for test builds, debugging etc. diff --git a/modules/motd/files/mayr.debian.org/motd.tail b/modules/motd/files/mayr.debian.org/motd.tail deleted file mode 100644 index 80a5a64af..000000000 --- a/modules/motd/files/mayr.debian.org/motd.tail +++ /dev/null @@ -1,4 +0,0 @@ -Johann(es) Simon Mayr (June 14, 1763 - December 2, 1845) - - Welcome to mayr.debian.org, the Debian mips build daemon. - Please use mahler.debian.org for test builds, debugging etc. 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 328daa325..000000000 --- a/modules/motd/files/merkel.debian.org/motd.tail +++ /dev/null @@ -1,5 +0,0 @@ -Gustav (Adolf) Merkel (November 12, 1827 - October 30, 1885) - - Welcome to merkel.debian.org, serving bugs backup/mirror, - bugs.qa.debian.org, ftp-master backup/mirror, nm.debian.org, - and qa.debian.org diff --git a/modules/motd/files/merulo.debian.org/motd.tail b/modules/motd/files/merulo.debian.org/motd.tail deleted file mode 100644 index fa222e0d7..000000000 --- a/modules/motd/files/merulo.debian.org/motd.tail +++ /dev/null @@ -1,3 +0,0 @@ -Claudio Merulo (8 April 1533 - 4 May 1604) - - Welcome to merulo.debian.org, the Debian ia64 porterbox. diff --git a/modules/motd/files/morales.debian.org/motd.tail b/modules/motd/files/morales.debian.org/motd.tail deleted file mode 100644 index 33bde1c9e..000000000 --- a/modules/motd/files/morales.debian.org/motd.tail +++ /dev/null @@ -1,3 +0,0 @@ -Cristóbal de Morales (c. 1500 - between September 4 and October 7, 1553) - - Welcome to morales.debian.org, the Debian mipsel porterbox. diff --git a/modules/motd/files/mundy.debian.org/motd.tail b/modules/motd/files/mundy.debian.org/motd.tail deleted file mode 100644 index a396903b6..000000000 --- a/modules/motd/files/mundy.debian.org/motd.tail +++ /dev/null @@ -1,4 +0,0 @@ -William Mundy (c. 1529 – 1591) - - Welcome to mundy.debian.org, the Debian ia64 build daemon. - Please use merulo.debian.org for test builds, debugging etc. diff --git a/modules/motd/files/murphy.debian.org/motd.tail b/modules/motd/files/murphy.debian.org/motd.tail deleted file mode 100644 index 2ab4dc4e9..000000000 --- a/modules/motd/files/murphy.debian.org/motd.tail +++ /dev/null @@ -1,2 +0,0 @@ - Welcome to murphy.debian.org, serving as mail smarthost and - search.debian.org development diff --git a/modules/motd/files/paer.debian.org/motd.tail b/modules/motd/files/paer.debian.org/motd.tail deleted file mode 100644 index 4f9d3805d..000000000 --- a/modules/motd/files/paer.debian.org/motd.tail +++ /dev/null @@ -1,3 +0,0 @@ -Ferdinando Paër (July 1, 1771 - May 3, 1839) - - Welcome to paer.debian.org, the Debian hppa porterbox. diff --git a/modules/motd/files/penalosa.debian.org/motd.tail b/modules/motd/files/penalosa.debian.org/motd.tail deleted file mode 100644 index 8a288e477..000000000 --- a/modules/motd/files/penalosa.debian.org/motd.tail +++ /dev/null @@ -1,4 +0,0 @@ -Francisco de Peñalosa (c. 1470 – April 1, 1528) - - Welcome to penalosa.debian.org, the Debian hppa build daemon. - Please use paer.debian.org for test builds, debugging etc. diff --git a/modules/motd/files/pergolesi.debian.org/motd.tail b/modules/motd/files/pergolesi.debian.org/motd.tail deleted file mode 100644 index 59f055e02..000000000 --- a/modules/motd/files/pergolesi.debian.org/motd.tail +++ /dev/null @@ -1,3 +0,0 @@ -Giovanni Battista Pergolesi (4 January 1710 - 16 or 17 March 1736) - - Welcome to pergolesi.debian.org, the Debian amd64 porterbox. diff --git a/modules/motd/files/ravel.debian.org/motd.tail b/modules/motd/files/ravel.debian.org/motd.tail deleted file mode 100644 index d6905b730..000000000 --- a/modules/motd/files/ravel.debian.org/motd.tail +++ /dev/null @@ -1,3 +0,0 @@ -Joseph-Maurice Ravel (March 7, 1875 – December 28, 1937) - - Welcome to ravel.debian.org, aka people.debian.org. diff --git a/modules/motd/files/samosa.debian.org/motd.tail b/modules/motd/files/samosa.debian.org/motd.tail deleted file mode 100644 index 54324b418..000000000 --- a/modules/motd/files/samosa.debian.org/motd.tail +++ /dev/null @@ -1,4 +0,0 @@ -weasel 20080513: - ~/.ssh/authorized_keys disabled, there's an /ssh-keys/ tho. - see /etc/ssh/sshd_config for how that's done. - diff --git a/modules/motd/files/schroeder.debian.org/motd.tail b/modules/motd/files/schroeder.debian.org/motd.tail deleted file mode 100644 index 0ba021cf8..000000000 --- a/modules/motd/files/schroeder.debian.org/motd.tail +++ /dev/null @@ -1,4 +0,0 @@ -schroeder -- Hermann Schroeder (1904-1984), German composer and conductor - - - This host is using an iptables firewall. See /etc/rc.boot/firewall{,6} - diff --git a/modules/motd/files/verdi.debian.org/motd.tail b/modules/motd/files/verdi.debian.org/motd.tail deleted file mode 100644 index f0275547f..000000000 --- a/modules/motd/files/verdi.debian.org/motd.tail +++ /dev/null @@ -1,3 +0,0 @@ - -20080517: moved firewall config into ferm. see /etc/ferm/ferm.conf -- weasel - diff --git a/modules/motd/files/voltaire.debian.org/motd.tail b/modules/motd/files/voltaire.debian.org/motd.tail deleted file mode 100644 index 6e1f1b7e7..000000000 --- a/modules/motd/files/voltaire.debian.org/motd.tail +++ /dev/null @@ -1,3 +0,0 @@ - -This machine is primarily a build daemon. Please do not start builds here -while the build daemon is busy. diff --git a/modules/motd/manifests/new.pp b/modules/motd/manifests/new.pp deleted file mode 100644 index 8a8d5a99f..000000000 --- a/modules/motd/manifests/new.pp +++ /dev/null @@ -1,6 +0,0 @@ -class motd::new inherits motd { - File ["/etc/motd.tail"] { - notify => Exec["updatemotd"], - content => template("motd-new.erb") - } -} diff --git a/templates/motd-new.erb b/templates/motd-new.erb deleted file mode 100644 index d0538d41e..000000000 --- a/templates/motd-new.erb +++ /dev/null @@ -1,55 +0,0 @@ -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. - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -<%= -purp = '' -if nodeinfo.has_key?('nameinfo') - purp += nodeinfo['nameinfo'] + "\n\n" -end - -purp += 'Welcome to ' + fqdn -if (nodeinfo['ldap'].at(0)) and (nodeinfo['ldap'][0].has_key?('purpose')) - if nodeinfo['ldap'][0]['purpose'].include?('buildd') - purp += ", the Debian " - if nodeinfo['ldap'][0].has_key?('architecture') - purp += nodeinfo['ldap'][0]['architecture'][0] - end - purp += " build daemon\n" - elsif nodeinfo['ldap'][0]['purpose'].include?('porterbox') - purp += ", the Debian " - if nodeinfo['ldap'][0].has_key?('architecture') - purp += nodeinfo['ldap'][0]['architecture'][0] - end - purp += " porterbox\n" - else - purp += ", used for the following services:\n" - nodeinfo['ldap'][0]['purpose'].each do |l| - if l =~ /\[\[(\*|-)?(.*?)\]\]/ - l = $2 - end - if l =~ /\[\[(.*?)\|(.*?)\]\]/ - l = $2 - end - purp += "\t" + l + "\n" - end - end -end - -if nodeinfo.has_key?('footer') - purp += "\n" + nodeinfo['footer'] + "\n" -end -purp --%> - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/templates/motd.erb b/templates/motd.erb index ff2223c39..d0538d41e 100644 --- a/templates/motd.erb +++ b/templates/motd.erb @@ -1,4 +1,3 @@ - This device is for authorized users only. All traffic on this device is monitored and will be used as evidence for prosecutions. @@ -11,13 +10,46 @@ 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. -<% if File.exists?("/etc/puppet/modules/motd/files/" + fqdn + "/motd.tail") -%> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -<% f = File.open("/etc/puppet/modules/motd/files/" + fqdn + "/motd.tail") -%> -<%= f.read -%> +<%= +purp = '' +if nodeinfo.has_key?('nameinfo') + purp += nodeinfo['nameinfo'] + "\n\n" +end + +purp += 'Welcome to ' + fqdn +if (nodeinfo['ldap'].at(0)) and (nodeinfo['ldap'][0].has_key?('purpose')) + if nodeinfo['ldap'][0]['purpose'].include?('buildd') + purp += ", the Debian " + if nodeinfo['ldap'][0].has_key?('architecture') + purp += nodeinfo['ldap'][0]['architecture'][0] + end + purp += " build daemon\n" + elsif nodeinfo['ldap'][0]['purpose'].include?('porterbox') + purp += ", the Debian " + if nodeinfo['ldap'][0].has_key?('architecture') + purp += nodeinfo['ldap'][0]['architecture'][0] + end + purp += " porterbox\n" + else + purp += ", used for the following services:\n" + nodeinfo['ldap'][0]['purpose'].each do |l| + if l =~ /\[\[(\*|-)?(.*?)\]\]/ + l = $2 + end + if l =~ /\[\[(.*?)\|(.*?)\]\]/ + l = $2 + end + purp += "\t" + l + "\n" + end + end +end + +if nodeinfo.has_key?('footer') + purp += "\n" + nodeinfo['footer'] + "\n" +end +purp +-%> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -<% f.close -%> -<% end -%> -- 2.20.1