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

[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 0d0a45bc8fe0dbe652c1cd7ec2b9f017a93504ce..1de0136d392a1a2abc0c1a28ff3ceef1290b0a44 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -8,6 +8,7 @@ nameinfo:
   argento.debian.org: Dominick Argento (b. October 27, 1927)
   barber.debian.org: Samuel Barber (1910 - 1981)
   bartok.debian.org: Béla Viktor János Bartók (March 25, 1881 - September 26, 1945)
+  beethoven.debian.org: Ludwig van Beethoven (16 December 1770 - 26 March 1827)
   bellini.debian.org: Vincenzo Salvatore Carmelo Francesco Bellini (November 3rd, 1801 - September 23rd, 1835)
   biber.debian.org: Heinrich Ignaz Franz von Biber (1664 - 1704)
   brahms.debian.org: Johannes Brahms (May 7, 1833 - April 3, 1897)
@@ -55,6 +56,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)
@@ -82,6 +84,7 @@ nameinfo:
   stabile.debian.org: Annibale Stabile (~1535 - April 1595)
   steffani.debian.org: Agostino Steffani (25 July 1653 - 12 February 1728)
   tartini.debian.org: Giuseppe Tartini (April 8, 1692 - February 26, 1770)
+  tchaikovsky.debian.org: Pyotr Ilyich Tchaikovsky (Пётр Ильич Чайковский) (May 7, 1840 - November 6, 1893)
   unger.debian.org: Caroline Unger (October 28, 1803 - March 23, 1877)
   valente.debian.org: Vincenzo Valente (February 21, 1855 - September 6, 1921)
   vitry.debian.org: Philippe de Vitry (1291 - 1361)
@@ -103,11 +106,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:
@@ -148,6 +158,7 @@ host_settings:
     - barber.debian.org
     - biber.debian.org
     - brahms.debian.org
+    - caballero.debian.org
     - fano.debian.org
     - fasch.debian.org
     - field.debian.org
@@ -159,6 +170,7 @@ host_settings:
     - malo.debian.org
     - mayer.debian.org
     - mayr.debian.org
+    - mundy.debian.org
     - murphy.debian.org
     - penalosa.debian.org
     - peri.debian.org
@@ -183,8 +195,10 @@ host_settings:
     ancina.debian.org: mailout.debian.org
     arcadelt.debian.org: mailout.debian.org
     argento.debian.org: mailout.debian.org
+    ball.debian.org: mailout.debian.org
     barber.debian.org: mailout.debian.org
     bartok.debian.org: mailout.debian.org
+    beethoven.debian.org: mailout.debian.org
     biber.debian.org: mailout.debian.org
     brahms.debian.org: mailout.debian.org
     caballero.debian.org: mailout.debian.org
@@ -231,6 +245,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
@@ -253,6 +268,7 @@ host_settings:
     spontini.debian.org: mailout.debian.org
     stabile.debian.org: mailout.debian.org
     steffani.debian.org: mailout.debian.org
+    tchaikovsky.debian.org: mailout.debian.org
     unger.debian.org: mailout.debian.org
     villa.debian.org: mailout.debian.org
     vitry.debian.org: mailout.debian.org
@@ -267,7 +283,12 @@ host_settings:
     ancina.debian.org: 2025
     kassia.debian.org: 587
     piatti.debian.org: 2025
-  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"
+  no_munin:
+    - carver.debian.org
+    - escher.debian.org
+    - fano.debian.org
+    - logtest01.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"
 ---