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

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index c40d45ff3..732360684 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -65,30 +65,6 @@ 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
-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
-  - tartini.debian.org
 services:
   bugsmaster: rietz.debian.org
   qamaster: merkel.debian.org
@@ -96,12 +72,51 @@ services:
   rtmaster: spohr.debian.org
   packagesmaster: powell.debian.org
   packagesqamaster: master.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"
+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"
 ---