add munin and nagios master declarations

[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 672ca67..af32f72 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -83,6 +83,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)
@@ -107,6 +108,8 @@ services:
   mailrelay:
     - draghi.debian.org
     - spohr.debian.org
+  muninmaster: spohr.debian.org
+  nagiosmaster: tchaikovsky.debian.org
   packagesmaster: powell.debian.org
   packagesqamaster: master.debian.org
   qamaster: merkel.debian.org
@@ -161,6 +164,7 @@ host_settings:
     - malo.debian.org
     - mayer.debian.org
     - mayr.debian.org
+    - mundy.debian.org
     - murphy.debian.org
     - penalosa.debian.org
     - peri.debian.org
@@ -185,6 +189,7 @@ 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
@@ -256,6 +261,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
@@ -270,7 +276,9 @@ 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:
+    - fano.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"
 ---