X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=8206d68a3d6741551fb5b4fc88e30e3916d1ee6b;hb=489c57a538241de27243d5a3bc2413c559d73022;hp=c40d45ff347e0a813a52f168ebcef88a9df7e1b1;hpb=713d0c4bdbd2637483fb825437bea5833944386f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index c40d45ff3..8206d68a3 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -1,7 +1,9 @@
 ---
 nameinfo:
   agnesi.debian.org: Maria Teresa Agnesi (October 17, 1720 - January 19, 1795)
+  agricola.debian.org: Alexander Agricola (1445 or 1446 - August 15, 1506)
   albeniz.debian.org: Isaac Manuel Francisco Albéniz i Pascual (May 29, 1860 - May 18, 1909)
+  allegri.debian.org: Gregorio Allegri (1582 - 7 February 1652)
   ancina.debian.org: Giovanni Giovenale Ancina (19 October 1545 - August 30, 1604)
   arcadelt.debian.org: Jacques Arcadelt (also Jacob Arcadelt) (?1507 - October 14, 1568)
   argento.debian.org: Dominick Argento (b. October 27, 1927)
@@ -20,6 +22,7 @@ nameinfo:
   klecker.debian.org: Dedicated to Joel 'Espy' Klecker (1979 - July 11, 2000)
   lafayette.debian.org: Eugenie Lafayette
   lebrun.debian.org: Francesca Lebrun (March 24, 1756 - May 14, 1791)
+  liszt.debian.org: Franz Liszt (October 22, 1811 - July 31, 1886)
   mahler.debian.org: Gustav Mahler (7 July 1860 - 18 May 1911)
   mayr.debian.org: Johann(es) Simon Mayr (June 14, 1763 - December 2, 1845)
   merkel.debian.org: Gustav (Adolf) Merkel (November 12, 1827 - October 30, 1885)
@@ -53,6 +56,7 @@ nameinfo:
   strauss.debian.org: Johann Baptist Strauß (October 25, 1825 - June 3, 1899)
   tartini.debian.org: Giuseppe Tartini (April 8, 1692 - February 26, 1770)
   unger.debian.org: Caroline Unger (October 28, 1803 - March 23, 1877)
+  valente.debian.org: Vincenzo Valente (February 21, 1855 - September 6, 1921)
   verdi.debian.org: Giuseppe Fortunino Francesco Verdi (October 9 or 10, 1813 - January 27, 1901)
   voltaire.debian.org: François-Marie Arouet (Voltaire) (21 November 1694 - 30 May 1778)
   wagner.debian.org: Wilhelm Richard Wagner (22 May 1813 - 13 February 1883)
@@ -65,30 +69,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 +76,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"
 ---