merge two blocks of hosts

[mirror/dsa-puppet.git] / modules / debian-org / misc / local.yaml

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 12ba036..721e7d0 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -32,6 +32,7 @@ nameinfo:
   clementi.debian.org: Muzio Clementi (January 23rd, 1752 - March 10th, 1832)
   chopin.debian.org: Frédéric Chopin (March 1st, 1810 - October 17th, 1849)
   cilea.debian.org: Francesco Cilèa (July 26th, 1866 - November 20th, 1950)
+  coccia.debian.org: Maria Rosa Coccia (January 4th, 1759 - November 1833)
   corelli.debian.org: Arcangelo Corelli (February 17th, 1653 - January 8th, 1713)
   coincy.debian.org: Gautier de Coincy (1177 - 1236)
   czerny.debian.org: Carl Czerny (February 21st, 1791 - July 15th, 1857)
@@ -65,7 +66,6 @@ nameinfo:
   jenkins.debian.org: John Jenkins (1592 - 1678)
   kaufmann.debian.org: Georg Friedrich Kauffmann (February 14th, 1679 - February 27th, 1735)
   klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11th, 2000)
-  kokkonen.debian.org: Joonas Kokkonen (November 13th, 1921 - October 1st, 1996)
   lamb.debian.org: John David Lamb (b. 1935)
   lafayette.debian.org: Eugenie Lafayette
   lebrun.debian.org: Francesca Lebrun (March 24th, 1756 - May 14th, 1791)
@@ -220,32 +220,27 @@ host_settings:
   apache2_www_mirror:
     - bellini.debian.org
     - gluck.debian.org
-    - kokkonen.debian.org
     - santoro.debian.org
     - senfl.debian.org
   not-bacula-client:
-    - berlioz.debian.org
-    - blavet.debian.org
-    - cilea.debian.org
-    - coincy.debian.org
-    - danzi.debian.org
     - franck.debian.org
-    - gombert.debian.org
-    - handel.debian.org
-    - lotti.debian.org
-    - mailly.debian.org
-    - merikanto.debian.org
-    - muffat.debian.org
-    - paganini.debian.org
-    - pettersson.debian.org
-    - rautavaara.debian.org
     - ravel.debian.org
-    - respighi.debian.org
     - ries.debian.org
-    - senfl.debian.org
     - sibelius.debian.org
-    - sonntag.debian.org
     - stabile.debian.org
+    # decommissioning
+    - cilea.debian.org
+    - merikanto.debian.org
+    - morricone.debian.org
+    - paganini.debian.org
+    - rautavaara.debian.org
+    - respighi.debian.org
+    - scelsi.debian.org
+    - unger.debian.org
+    - vitry.debian.org
+    # dead/not running
+    - berlioz.debian.org
+    - coincy.debian.org
     # mirrors, secondaries, syncproxies
     - beach.debian.org
     - bizet.debian.org
@@ -268,11 +263,6 @@ host_settings:
     - steffani.debian.org
     - villa.debian.org
     - wieck.debian.org
-    # pending cleanup/repurpose/decommission
-    - morricone.debian.org
-    - scelsi.debian.org
-    - unger.debian.org
-    - vitry.debian.org
     # kvm host
     - bertali.debian.org
     - bm-bl3.debian.org