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

[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 d3f9652bf5946cbdb70bc8e17fb6566dd3f9adc4..7b8b8154fac0eaa13faaf4cce3b68c92a03f2581 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -9,6 +9,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)
+  busoni.debian.org: Ferruccio Dante Michelangiolo Benvenuto Busoni (April 1, 1866 - July 27, 1924)
   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)
@@ -83,6 +84,8 @@ footer:
   zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
 services:
   bugsmaster: rietz.debian.org
+  bugsmx:
+    - byrd.debian.org
   mailrelay:
     - draghi.debian.org
     - spohr.debian.org
@@ -93,6 +96,7 @@ services:
 host_settings:
   heavy_exim:
     - bellini.debian.org
+    - byrd.debian.org
     - draghi.debian.org
     - klecker.debian.org
     - master.debian.org
@@ -117,6 +121,7 @@ host_settings:
     - raff.debian.org
     - ravel.debian.org
     - respighi.debian.org
+    - ries.debian.org
     - rore.debian.org
     - saens.debian.org
     - samosa.debian.org
@@ -163,6 +168,8 @@ host_settings:
   squeeze:
     - fano.debian.org
     - finzi.debian.org
+  smarthost_port:
+    voltaire.debian.org: 25
   smarthost:
     agnesi.debian.org: mailout.debian.org
     agricola.debian.org: mailout.debian.org
@@ -170,34 +177,59 @@ host_settings:
     ancina.debian.org: mailout.debian.org
     arcadelt.debian.org: mailout.debian.org
     argento.debian.org: mailout.debian.org
+    bartok.debian.org: mailout.debian.org
     brahms.debian.org: mailout.debian.org
+    caballero.debian.org: mailout.debian.org
     crest.debian.org: mailout.debian.org
+    dijkstra.debian.org: mailout.debian.org
+    escher.debian.org: mailout.debian.org
     fano.debian.org: mailout.debian.org
     finzi.debian.org: mailout.debian.org
+    geo1.debian.org: mailout.debian.org
+    geo2.debian.org: mailout.debian.org
+    geo3.debian.org: mailout.debian.org
+    gluck.debian.org: mailout.debian.org
     goedel.debian.org: mailout.debian.org
     goetz.debian.org: mailout.debian.org
+    handel.debian.org: mailout.debian.org
     kassia.debian.org: mailout.debian.org
     lafayette.debian.org: mailout.debian.org
     lebrun.debian.org: mailout.debian.org
     leisner.debian.org: mailout.debian.org
+    lobos.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
     merulo.debian.org: mailout.debian.org
     morales.debian.org: mailout.debian.org
+    mundy.debian.org: mailout.debian.org
     murphy.debian.org: mailout.debian.org
     paer.debian.org: mailout.debian.org
     penalosa.debian.org: mailout.debian.org
     pergolesi.debian.org: mailout.debian.org
+    peri.debian.org: mailout.debian.org
     pescetti.debian.org: mailout.debian.org
     piatti.debian.org: mailout.debian.org
     praetorius.debian.org: mailout.debian.org
     puccini.debian.org: mailout.debian.org
     rem.debian.org: mailout.debian.org
+    rore.debian.org: mailout.debian.org
+    saens.debian.org: mailout.debian.org
+    schein.debian.org: mailout.debian.org
     schroeder.debian.org: mailout.debian.org
+    schumann.debian.org: mailout.debian.org
+    senfl.debian.org: mailout.debian.org
     smetana.debian.org: mailout.debian.org
+    soler.debian.org: mailout.debian.org
     sperger.debian.org: mailout.debian.org
     spontini.debian.org: mailout.debian.org
+    steffani.debian.org: mailout.debian.org
+    unger.debian.org: mailout.debian.org
+    villa.debian.org: mailout.debian.org
+    voltaire.debian.org: mailout.debian.org
+    wieck.debian.org: mailout.debian.org
     zee.debian.org: mailout.debian.org
     zelenka.debian.org: mailout.debian.org
   mail_port:
@@ -205,6 +237,6 @@ host_settings:
     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"
+    ball.debian.org: "0.0.0.0/8 : 127.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"
 ---