From 7df87f1f9903d5a71751a9000d8b0a893991ee8a Mon Sep 17 00:00:00 2001 From: Martin Zobel-Helas Date: Fri, 8 Feb 2013 11:15:05 +0100 Subject: [PATCH] no more widor Signed-off-by: Martin Zobel-Helas --- modules/apache2/manifests/init.pp | 2 +- modules/bacula/manifests/client.pp | 2 +- modules/debian-org/misc/local.yaml | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp index a7715586f..ef2864e36 100644 --- a/modules/apache2/manifests/init.pp +++ b/modules/apache2/manifests/init.pp @@ -77,7 +77,7 @@ class apache2 { } } - if $::hostname in [busoni,holter,lindberg,master,powell,beach,buxtehude,widor] { + if $::hostname in [busoni,holter,lindberg,master,powell,beach,buxtehude] { include apache2::dynamic } else { @ferm::rule { 'dsa-http': diff --git a/modules/bacula/manifests/client.pp b/modules/bacula/manifests/client.pp index 8cf215bc2..9f43e8603 100644 --- a/modules/bacula/manifests/client.pp +++ b/modules/bacula/manifests/client.pp @@ -1,7 +1,7 @@ class bacula::client inherits bacula { @@bacula::storage-per-node { $::fqdn: } - if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, lully, master, new-master, schumann, soler, widor, wilder, wolkenstein] { + if $::hostname in [beethoven, berlioz, biber, diabelli, dinis, draghi, geo3, lully, master, new-master, schumann, soler, wilder, wolkenstein] { @@bacula::node { $::fqdn: } } diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index 2af3cab54..db380556f 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -136,7 +136,6 @@ nameinfo: vento.debian.org: Ivo de Vento (1543/1545 - 1575) vieuxtemps.debian.org: Henri Vieuxtemps (February 17th, 1820 - June 6th, 1881) vitry.debian.org: Philippe de Vitry (October 31st, 1291 - June 9th, 1361) - widor.debian.org: Charles-Marie Jean Albert Widor (February 21st, 1844 - March 12th, 1937) wieck.debian.org: Clara Josephine Wieck (September 13th, 1819 - May 20th, 1896) wilder.debian.org: Alec Wilder (February 16th, 1907 - December 24th, 1980) wolkenstein.debian.org: Oswald von Wolkenstein (1377 - August 2nd, 1445) @@ -271,7 +270,6 @@ host_settings: - englund.debian.org - rautavaara.debian.org - salieri.debian.org - - widor.debian.org static_master: - bizet.debian.org static_mirror: -- 2.20.1