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

[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 7b27652..6a36dd9 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -18,6 +18,7 @@ nameinfo:
   chopin.debian.org: Frédéric Chopin (1 March 1810 - 17 October 1849)
   cilea.debian.org: Francesco Cilèa (1866 - 1950)
   cimarosa.debian.org: Domenico Cimarosa (17 December 1749 - 11 January 1801)
+  corelli.debian.org: Arcangelo Corelli (February 17th, 1653 – January 8th, 1713)
   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)
@@ -25,6 +26,7 @@ nameinfo:
   fasch.debian.org: Johann Friedrich Fasch (1688 - 1758)
   field.debian.org: John Field (1782 - 1837)
   finzi.debian.org: Gerald Raphael Finzi (14 July 1901 - 27 September 1956)
+  gabrielli.debian.org: Domenico Gabrielli (April 15th, 1651 – July 10th, 1690)
   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)
@@ -56,6 +58,7 @@ nameinfo:
   pergolesi.debian.org: Giovanni Battista Pergolesi (4 January 1710 - 16 or 17 March 1736)
   peri.debian.org: Jacopo Peri (20 August 1561 - 12 August 1633)
   pescetti.debian.org: Giovanni Battista Pescetti (ca. 1704  - 1766)
+  pettersson.debian.org: Gustav Allan Pettersson (September 19, 1911 - June 20, 1980)
   piatti.debian.org: Carlo Alfredo Piatti (January 8, 1822 - July 18, 1901)
   powell.debian.org: Andrew Powell (b. 18 April 1949)
   praetorius.debian.org: Hieronymus Praetorius (10 August 1560 - 27 January 1629)
@@ -96,7 +99,6 @@ nameinfo:
   zelenka.debian.org: Jan Dismas Zelenka (16 October 1679 - 23 December 1745)
 footer:
   lebrun.debian.org: "- This host is using an iptables firewall.  See /etc/rc.boot/firewall{,6}"
-  schroeder.debian.org: "- This host is using an iptables firewall.  See /etc/rc.boot/firewall{,6}"
   zandonai.debian.org: "Debian s390 buildd system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
   zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
 services:
@@ -105,11 +107,18 @@ services:
     - rietz.debian.org
   bugsmx:
     - byrd.debian.org
+  dbmaster:
+    - draghi.debian.org
   mailrelay:
     - draghi.debian.org
     - spohr.debian.org
+  muninmaster: spohr.debian.org
+  nagiosmaster:
+    - draghi.debian.org
+    - tchaikovsky.debian.org
   packagesmaster: powell.debian.org
   packagesqamaster: master.debian.org
+  puppetmaster: handel.debian.org
   qamaster: merkel.debian.org
   rtmaster: spohr.debian.org
 host_settings:
@@ -151,6 +160,7 @@ host_settings:
     - biber.debian.org
     - brahms.debian.org
     - caballero.debian.org
+    - corelli.debian.org
     - fano.debian.org
     - fasch.debian.org
     - field.debian.org
@@ -197,6 +207,7 @@ host_settings:
     carver.debian.org: mailout.debian.org
     cilea.debian.org: mailout.debian.org
     crest.debian.org: mailout.debian.org
+    corelli.debian.org: mailout.debian.org
     dijkstra.debian.org: mailout.debian.org
     duarte.debian.org: mailout.debian.org
     escher.debian.org: mailout.debian.org
@@ -204,6 +215,7 @@ host_settings:
     fasch.debian.org: mailout.debian.org
     field.debian.org: mailout.debian.org
     finzi.debian.org: mailout.debian.org
+    gabrielli.debian.org: mailout.debian.org
     geo1.debian.org: mailout.debian.org
     geo2.debian.org: mailout.debian.org
     geo3.debian.org: mailout.debian.org
@@ -237,6 +249,7 @@ host_settings:
     pergolesi.debian.org: mailout.debian.org
     peri.debian.org: mailout.debian.org
     pescetti.debian.org: mailout.debian.org
+    pettersson.debian.org: mailout.debian.org
     piatti.debian.org: mailout.debian.org
     praetorius.debian.org: mailout.debian.org
     puccini.debian.org: mailout.debian.org
@@ -275,7 +288,16 @@ host_settings:
     kassia.debian.org: 587
     piatti.debian.org: 2025
   no_munin:
+    - agnesi.debian.org
+    - allegri.debian.org
+    - carver.debian.org
+    - escher.debian.org
     - fano.debian.org
+    - logtest01.debian.org
+    - mahler.debian.org
+    - malo.debian.org
+    - mendes.debian.org
+    - morales.debian.org
 #  reservedaddrs:
 #    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"
 ---