Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

[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 82d0dd6..d7a8da0 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -10,6 +10,7 @@ nameinfo:
   bartok.debian.org: Béla Viktor János Bartók (March 25, 1881 - September 26, 1945)
   bellini.debian.org: Vincenzo Salvatore Carmelo Francesco Bellini (November 3rd, 1801 - September 23rd, 1835)
   brahms.debian.org: Johannes Brahms (May 7, 1833 - April 3, 1897)
+  byrd.debian.org: William Byrd (1543 - 1623)
   carver.debian.org: Robert Carver (ca.1485 - ca.1570)
   chopin.debian.org: Frédéric Chopin (1 March 1810 - 17 October 1849)
   cimarosa.debian.org: Domenico Cimarosa (17 December 1749 - 11 January 1801)
@@ -77,26 +78,26 @@ footer:
   zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
 services:
   bugsmaster: rietz.debian.org
-  qamaster: merkel.debian.org
   mailrelay: spohr.debian.org
-  rtmaster: spohr.debian.org
   packagesmaster: powell.debian.org
   packagesqamaster: master.debian.org
+  qamaster: merkel.debian.org
+  rtmaster: spohr.debian.org
 host_settings:
   heavy_exim:
-    - raff.debian.org
-    - gluck.debian.org
-    - merkel.debian.org
-    - spohr.debian.org
     - draghi.debian.org
+    - klecker.debian.org
     - master.debian.org
+    - merkel.debian.org
+    - powell.debian.org
+    - raff.debian.org
     - ries.debian.org
     - rietz.debian.org
-    - klecker.debian.org
-    - powell.debian.org
+    - spohr.debian.org
   apache2_defaultconfig:
     - bellini.debian.org
     - carver.debian.org
+    - cimarosa.debian.org
     - draghi.debian.org
     - duarte.debian.org
     - gluck.debian.org
@@ -127,18 +128,18 @@ host_settings:
     - lafayette.debian.org
     - malo.debian.org
     - murphy.debian.org
+    - paer.debian.org
     - praetorius.debian.org
     - puccini.debian.org
-    - paer.debian.org
   smarthost:
-    ancina.debian.org: mailout.debian.org
     allegri.debian.org: mailout.debian.org
+    ancina.debian.org: mailout.debian.org
     piatti.debian.org: mailout.debian.org
   mail_port:
-    ancina.debian.org: 2025
     allegri.debian.org: 2025
-    piatti.debian.org: 2025
+    ancina.debian.org: 2025
     kassia.debian.org: 587
+    piatti.debian.org: 2025
   reservedaddrs:
     ball.debian.org: "0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5"
 ---