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 f09d17d..c40d45f 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -10,6 +10,8 @@ nameinfo:
   carver.debian.org: Robert Carver (ca.1485 - ca.1570)
   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)
@@ -63,5 +65,43 @@ 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
+  mailrelay: spohr.debian.org
+  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"
 ---