X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=eca934c44464519344312fc4cb8ea01ca4efde43;hb=a8043177854985ca6c1a819f8126b5d3ae8a8f74;hp=e897862f764b0ddc7893fbf644be71d5ef037f61;hpb=9fc356a7c6c4e5c2184f4d5a3f654ede04bc83f6;p=dsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index e897862f..eca934c4 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -81,6 +81,7 @@ nameinfo:
   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)
@@ -94,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)
@@ -150,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
@@ -231,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
@@ -263,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:
@@ -283,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: