X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=7323606842c76e51ba714951d2d250ef1bbf3833;hb=4585d002d4a4a2482bb276444ed224eb3428c620;hp=74ba18d4e7aaf96e355ba75904a082108be871cb;hpb=b91151964df50a2521a0352cd253069c0f296d87;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 74ba18d4e..732360684 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -11,6 +11,7 @@ nameinfo:
   chopin.debian.org: Frédéric Chopin (1 March 1810 - 17 October 1849)
   dijkstra.debian.org: Lowell Dijkstra (b.1952)
   draghi.debian.org: Antonio Draghi (1635 - 16 January  1700)
+  duarte.debian.org: Leonora Duarte (28 July  1610 - 1678)
   gluck.debian.org: Christoph Willibald Ritter von Gluck (2 July 1714 - 15 November 1787)
   goedel.debian.org: Kurt Gödel (April 28, 1906 - January 14, 1978)
   goetz.debian.org: Hermann Gustav Goetz (December 7, 1840 - December 3, 1876)
@@ -64,15 +65,58 @@ footer:
   schroeder.debian.org: "- This host is using an iptables firewall.  See /etc/rc.boot/firewall{,6}"
   verdi.debian.org: "- This host is using an iptables firewall.  See /etc/ferm/ferm.conf"
   zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
-need_smarthost:
-  - ancina.debian.org
-  - allegri.debian.org
-  - piatti.debian.org
 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
+host_settings:
+  heavy_exim:
+    - raff.debian.org
+    - gluck.debian.org
+    - merkel.debian.org
+    - spohr.debian.org
+    - draghi.debian.org
+    - master.debian.org
+    - ries.debian.org
+    - rietz.debian.org
+    - klecker.debian.org
+    - powell.debian.org
+  apache2_defaultconfig:
+    - carver.debian.org
+    - draghi.debian.org
+    - duarte.debian.org
+    - piatti.debian.org
+    - rore.debian.org
+    - saens.debian.org
+    - samosa.debian.org
+    - senfl.debian.org
+    - tartini.debian.org
+  buildd:
+    - ancina.debian.org
+    - arcadelt.debian.org
+    - argento.debian.org
+    - brahms.debian.org
+    - goedel.debian.org
+    - goetz.debian.org
+    - lafayette.debian.org
+    - malo.debian.org
+    - murphy.debian.org
+    - praetorius.debian.org
+    - puccini.debian.org
+    - paer.debian.org
+  smarthost:
+    ancina.debian.org: mailout.debian.org
+    allegri.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
+    kassia.debian.org: 587
+  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"
 ---