X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=eca934c44464519344312fc4cb8ea01ca4efde43;hb=a8043177854985ca6c1a819f8126b5d3ae8a8f74;hp=2af3cab5424a6ab55d2d3011113fe06919a48a69;hpb=21d0e8e7061c9f4eca5f7a864f58a4c8d6812c98;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 2af3cab54..eca934c44 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -75,12 +75,15 @@ nameinfo:
   lotti.debian.org: Antonio Lotti (ca. 1667 - January 5th, 1740)
   luchesi.debian.org: Andrea Luca Luchesi (May 23rd, 1741 - March 21st, 1801)
   lully.debian.org: Jean-Baptiste de Lully (November 28th, 1632 - March 22nd, 1687)
+  mailly.debian.org: Alphonse Jean Ernest Mailly (November 27th, 1833 - January 10th, 1918)
   mayer.debian.org: John Mayer (October 28th, 1930 - March 9th, 2004)
   mayr.debian.org: Johann(es) Simon Mayr (June 14th, 1763 - December 2nd, 1845)
   menotti.debian.org: Gian Carlo Menotti (July 7th, 1911 - February 1st,, 2007)
   merikanto.debian.org: Oskar Merikanto (August 5th, 1868 - February 17th, 1924)
   merulo.debian.org: Claudio Merulo (April 8th, 1533 - May 4th, 1604)
+  milanollo.debian.org: Teresa Milanollo (August 28th, 1827 - October 25th, 1904)
   morricone.debian.org: Ennio Morricone (November 10th, 1928 - )
+  muffat.debian.org: George Muffat (June 1st, 1653 - February 23rd, 1704)
   mundy.debian.org: William Mundy (c. 1529 - 1591)
   nielsen.debian.org: Carl August Nielsen (June 9th, 1865 - October 3rd, 1931)
   nono.debian.org: Luigi Nono (January 29, 1924 - May 8, 1990)
@@ -92,6 +95,7 @@ nameinfo:
   pergolesi.debian.org: Giovanni Battista Pergolesi (January 4th, 1710 - March 16th or 17th, 1736)
   pettersson.debian.org: Gustav Allan Pettersson (September 19th, 1911 - June 20th, 1980)
   piatti.debian.org: Carlo Alfredo Piatti (January 8th, 1822 - July 18th, 1901)
+  picconi.debian.org: Maria Antonietta Picconi (September 23rd, 1869 - 1926)
   piston.debian.org: Walter Hamor Piston Jr. (January 20th, 1894 – November 12th, 1976)
   popov.debian.org: Gavriil Nikolayevich Popov (Гаврии́л Никола́евич Попо́в) (September 12th, 1904 - February 17th, 1972)
   porpora.debian.org: Niccolò (Antonio) Porpora (17 August 1686 - 3 March 1768)
@@ -136,7 +140,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)
@@ -149,8 +152,6 @@ footer:
   #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:
-  backports_master:
-    - morricone.debian.org
   bugsmaster:
   bugsmx:
     - busoni.debian.org
@@ -167,7 +168,9 @@ services:
     - franck.debian.org
     - ravel.debian.org
   mailrelay:
+    - mailly.debian.org
     - merikanto.debian.org
+    - muffat.debian.org
   muninmaster:
     - spohr.debian.org
     - menotti.debian.org
@@ -196,9 +199,11 @@ host_settings:
     - franck.debian.org
     - gombert.debian.org
     - grieg.debian.org
+    - mailly.debian.org
     - master.debian.org
     - merikanto.debian.org
     - morricone.debian.org
+    - muffat.debian.org
     - nono.debian.org
     - popov.debian.org
     - powell.debian.org
@@ -226,11 +231,7 @@ host_settings:
     - senfl.debian.org
   'apache2_ftp-upcoming_mirror':
     - klecker.debian.org
-    - merikanto.debian.org
     - rietz.debian.org
-  apache2_backports_mirror:
-    - englund.debian.org
-    - morricone.debian.org
   timeserver:
     - busoni.debian.org
     - merikanto.debian.org
@@ -258,7 +259,7 @@ host_settings:
     - sompek.debian.org
   mail_port:
     ancina.debian.org: 2025
-    klecker.debian.org: 587
+    klecker.debian.org: 2025
     piatti.debian.org: 2025
     zappa.debian.org: 587
   no_munin:
@@ -271,7 +272,6 @@ host_settings:
     - englund.debian.org
     - rautavaara.debian.org
     - salieri.debian.org
-    - widor.debian.org
   static_master:
     - bizet.debian.org
   static_mirror:
@@ -279,6 +279,9 @@ host_settings:
     - rietz.debian.org
     - stanley.debian.org
   static_source:
+    - master.debian.org
+    - ries.debian.org
+    - franck.debian.org
     - senfl.debian.org
     - wolkenstein.debian.org
 #  reservedaddrs: