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 baa3eb5..1de0136 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -56,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)
@@ -111,9 +112,12 @@ services:
     - draghi.debian.org
     - spohr.debian.org
   muninmaster: spohr.debian.org
-  nagiosmaster: tchaikovsky.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:
@@ -241,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
@@ -279,7 +284,10 @@ host_settings:
     kassia.debian.org: 587
     piatti.debian.org: 2025
   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"
 ---