X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=cdc56c2aeefea8c893b162122fdaa8ce4c0b90d5;hb=6c89b952e2db008578761e06a2f2a517ce50cb4e;hp=e897862f764b0ddc7893fbf644be71d5ef037f61;hpb=9fc356a7c6c4e5c2184f4d5a3f654ede04bc83f6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index e897862f7..cdc56c2ae 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -150,8 +150,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 +229,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 +257,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 +277,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: