X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=1c356cec615cd4ea313f21040dbbb3ac48bd20a1;hb=678631469f23ba38dff2106772684f35586632f8;hp=f60ab0c45ccbd9070db22fa34f73dcd152205816;hpb=bf8d1691b48cc061f1c6f21422601b8c573dadfc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index f60ab0c45..1c356cec6 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -13,7 +13,6 @@ nameinfo:
   biber.debian.org: Heinrich Ignaz Franz von Biber (August 12th, 1664 - May 3rd, 1704)
   brahms.debian.org: Johannes Brahms (May 7th, 1833 - April 3rd, 1897)
   busoni.debian.org: Ferruccio Dante Michelangiolo Benvenuto Busoni (April 1st, 1866 - July 27th, 1924)
-  byrd.debian.org: William Byrd (1543 - July 4th, 1623)
   carver.debian.org: Robert Carver (ca.1485 - ca.1570)
   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)
@@ -27,6 +26,7 @@ nameinfo:
   fasch.debian.org: Johann Friedrich Fasch (1688 - 1758)
   field.debian.org: John Field (1782 - 1837)
   finzi.debian.org: Gerald Raphael Finzi (July 14th, 1901 - September 27th, 1956)
+  franck.debian.org: Melchior Franck (1579 - June 1st, 1639)
   gabrielli.debian.org: Domenico Gabrielli (April 15th, 1651 – July 10th, 1690)
   gluck.debian.org: Christoph Willibald Ritter von Gluck (July 2nd, 1714 - November 15th, 1787)
   goedel.debian.org: Kurt Gödel (April 28th, 1906 - January 14th, 1978)
@@ -100,20 +100,18 @@ nameinfo:
   zandonai.debian.org: Riccardo Zandonai (May 30th, 1883 - June 5th, 1944)
   zelenka.debian.org: Jan Dismas Zelenka (October 16th, 1679 - December 23rd, 1745)
 footer:
-  lebrun.debian.org: "- This host is using an iptables firewall.  See /etc/rc.boot/firewall{,6}"
   zandonai.debian.org: "Debian s390 buildd system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
   zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
 services:
   bugsmaster:
-    - rietz.debian.org
   bugsmx:
     - busoni.debian.org
-    - byrd.debian.org
   dbmaster:
     - draghi.debian.org
   mailrelay:
     - draghi.debian.org
     - spohr.debian.org
+    - merikanto.debian.org
   muninmaster: spohr.debian.org
   nagiosmaster:
     - draghi.debian.org
@@ -127,18 +125,17 @@ host_settings:
   heavy_exim:
     - bellini.debian.org
     - busoni.debian.org
-    - byrd.debian.org
     - chopin.debian.org
     - draghi.debian.org
     - grieg.debian.org
     - klecker.debian.org
     - master.debian.org
+    - merikanto.debian.org
     - merkel.debian.org
     - morricone.debian.org
     - powell.debian.org
     - ravel.debian.org
     - ries.debian.org
-    - rietz.debian.org
     - spohr.debian.org
     - valente.debian.org
   apache2_security_mirror:
@@ -170,6 +167,7 @@ host_settings:
     - goetz.debian.org
     - lafayette.debian.org
     - lebrun.debian.org
+    - lucatelli.debian.org
     - malo.debian.org
     - mayer.debian.org
     - mayr.debian.org
@@ -208,8 +206,8 @@ host_settings:
     carver.debian.org: mailout.debian.org
     cilea.debian.org: mailout.debian.org
     cimarosa.debian.org: mailout.debian.org
-    crest.debian.org: mailout.debian.org
     corelli.debian.org: mailout.debian.org
+    crest.debian.org: mailout.debian.org
     dijkstra.debian.org: mailout.debian.org
     duarte.debian.org: mailout.debian.org
     englund.debian.org: mailout.debian.org
@@ -228,19 +226,20 @@ host_settings:
     handel.debian.org: mailout.debian.org
     holter.debian.org: mailout.debian.org
     kassia.debian.org: mailout.debian.org
+    kaufmann.debian.org: mailout.debian.org
     krenek.debian.org: mailout.debian.org
     lafayette.debian.org: mailout.debian.org
     lebrun.debian.org: mailout.debian.org
     leisner.debian.org: mailout.debian.org
     lindberg.debian.org: mailout.debian.org
     lobos.debian.org: mailout.debian.org
+    lucatelli.debian.org: mailout.debian.org
     luchesi.debian.org: mailout.debian.org
     mahler.debian.org: mailout.debian.org
     malo.debian.org: mailout.debian.org
     mayer.debian.org: mailout.debian.org
     mayr.debian.org: mailout.debian.org
     mendes.debian.org: mailout.debian.org
-    merikanto.debian.org: mailout.debian.org
     merulo.debian.org: mailout.debian.org
     monteverdi.debian.org: mailout.debian.org
     morales.debian.org: mailout.debian.org
@@ -262,6 +261,7 @@ host_settings:
     rautavaara.debian.org: mailout.debian.org
     rem.debian.org: mailout.debian.org
     respighi.debian.org: mailout.debian.org
+    rietz.debian.org: mailout.debian.org
     rore.debian.org: mailout.debian.org
     saens.debian.org: mailout.debian.org
     scelsi.debian.org: mailout.debian.org