From 2ee825a91909505b0dcca7d2392207e3bf19b9a8 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 16 Dec 2012 10:59:01 +0000 Subject: [PATCH] more dead hosts Signed-off-by: Stephen Gran --- modules/debian-org/misc/local.yaml | 4 ---- modules/ferm/manifests/per-host.pp | 7 ------- .../templates/obsolete-packages-ignore.d-hostspecific.erb | 2 +- modules/sudo/files/sudoers | 2 +- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index 760ecec25..6ac7007b6 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -44,7 +44,6 @@ nameinfo: falla.debian.org: Manuel de Falla y Matheu (November 23rd, 1876 - November 14th, 1946) fano.debian.org: Guido Alberto Fano (March 18th, 1875 - August 14th, 1961) fasch.debian.org: Johann Friedrich Fasch (1688 - 1758) - field.debian.org: John Field (1782 - 1837) fils.debian.org: Anton Fils (September 22nd, 1733 (baptized) - March 14th, 1760 (buried)) finzi.debian.org: Gerald Raphael Finzi (July 14th, 1901 - September 27th, 1956) fischer.debian.org: Johann Caspar Ferdinand Fischer (September 9th, 1656 - August 27th, 1746) @@ -57,7 +56,6 @@ nameinfo: grieg.debian.org: Edvard Hagerup Grieg (June 15th, 1843 - September 4th, 1907) handel.debian.org: Georg Friedrich Händel (February 23rd, 1685 - April 14th, 1759) harris.debian.org: Sir William Henry Harris (March 28th, 1883 - September 6th, 1973) - hartmann.debian.org: Karl Amadeus Hartmann (August 2nd, 1905 - December 5th, 1963) hasse.debian.org: Johann Adolph Hasse (March 25th, 1699 - December 16th, 1783) hebden.debian.org: John Hebden (1712 - 1765) henze.debian.org: Hans Werner Henze (July 1st, 1926 - October 27th, 2012) @@ -112,7 +110,6 @@ nameinfo: salieri.debian.org: Antonio Salieri (August 18th, 1750 - May 7th, 1825) samosa.debian.org: The samosa is a stuffed pastry and a popular snack in South Asia, Southeast Asia, Central Asia, the Arabian Peninsula, throughout the Mediterranean (Greece), Southwest Asia, the Horn of Africa and North Africa. santoro.debian.org: Cláudio Santoro (November 23rd, 1919 - March 27th, 1989) - scelsi.debian.org: Giacinto Scelsi (January 8th, 1905 - August 9th, 1988) schein.debian.org: Johann Hermann Schein (January 20th, 1586 - November 19th, 1630) schroeder.debian.org: Hermann Schroeder (March 26th, 1904 - October 7th, 1984) schumann.debian.org: Robert Alexander Schumann (June 8th, 1810 - July 29th, 1856) @@ -247,7 +244,6 @@ host_settings: - arnold.debian.org - ball.debian.org - harris.debian.org - - hartmann.debian.org - hasse.debian.org - hebden.debian.org - henze.debian.org diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp index 7f1e29200..7be941a52 100644 --- a/modules/ferm/manifests/per-host.pp +++ b/modules/ferm/manifests/per-host.pp @@ -155,13 +155,6 @@ class ferm::per-host { rule => '&TCP_UDP_SERVICE(5080)' } } - scelsi: { - @ferm::rule { 'dc11-icecast': - domain => '(ip ip6)', - description => 'Allow icecast access', - rule => '&SERVICE(tcp, 8000)' - } - } default: {} } diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb index d330721a6..f4532cfb4 100644 --- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb +++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb @@ -19,7 +19,7 @@ when "rossini.debian.org": ignore << %w{ganeti2} when "franck.debian.org": ignore << %w{python-apt} when /(abel|arnold|alain|alwyn|antheil|arne).debian.org/: ignore << %w{flash-kernel linux-firmware-image} when /(harris|hoiby).debian.org/: ignore << %w{flash-kernel kernel linux-firmware-image} -when /(hartmann|hasse|hebden|henze).debian.org/: ignore << %w{flash-kernel kernel linux-firmware-image schroot schroot-common} +when /(hasse|hebden|henze).debian.org/: ignore << %w{flash-kernel kernel linux-firmware-image schroot schroot-common} when /(parry|partch|piston).debian.org/: ignore << "yaboot" when "grieg.debian.org": ignore << %w{dpkg} diff --git a/modules/sudo/files/sudoers b/modules/sudo/files/sudoers index 17fa29cb4..fc824c2d4 100644 --- a/modules/sudo/files/sudoers +++ b/modules/sudo/files/sudoers @@ -29,7 +29,7 @@ Host_Alias FTPHOSTS = franck, morricone Host_Alias ZIVITHOSTS = zelenka, zandonai Host_Alias AACRAIDHOSTS = bellini, morricone, paganini, respighi, beethoven, pettersson Host_Alias MEGARAIDHOSTS = grieg, rautavaara, sibelius -Host_Alias MPTRAIDHOSTS = master, fasch, holter, barber, biber, cilea, vitry, krenek, scelsi, orff, field +Host_Alias MPTRAIDHOSTS = master, fasch, holter, barber, biber, cilea, vitry, krenek, orff Host_Alias MEGACTLHOSTS = lindberg, englund, nielsen Host_Alias LISTHOSTS = bendel -- 2.20.1