From: Peter Palfrader Date: Wed, 18 Jul 2012 13:00:36 +0000 (+0200) Subject: decommission duarte (RT#3942) X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=709438a136ff74644565a7c81ceefb922ca6b519 decommission duarte (RT#3942) --- diff --git a/manifests/site.pp b/manifests/site.pp index 564986b0..aeccdb7c 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -87,7 +87,7 @@ node default { include dacs } - if $::hostname in [beethoven,duarte,spohr,stabile,beach] { + if $::hostname in [beethoven,spohr,stabile,beach] { include nfs-server } diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp index b89bafe1..a7715586 100644 --- a/modules/apache2/manifests/init.pp +++ b/modules/apache2/manifests/init.pp @@ -77,7 +77,7 @@ class apache2 { } } - if $::hostname in [busoni,duarte,holter,lindberg,master,powell,beach,buxtehude,widor] { + if $::hostname in [busoni,holter,lindberg,master,powell,beach,buxtehude,widor] { include apache2::dynamic } else { @ferm::rule { 'dsa-http': diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index b8cb2251..7fa5eef9 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -35,7 +35,6 @@ nameinfo: diamond.debian.org: David Leo Diamond (July 9, 1915 - June 13, 2005) dijkstra.debian.org: Lowell Dijkstra (b.1952) draghi.debian.org: Antonio Draghi (1635 - January 16th, 1700) - duarte.debian.org: Leonora Duarte (July 28th, 1610 - 1678) eder.debian.org: Helmut Eder (December 26th, 1916 - February 8th, 2005) elgar.debian.org: Edward Elgar (1857 - 1934) englund.debian.org: Sven Einar Englund (June 17th, 1916 - June 27th, 1999)