merkel2 no longer does http and https, but nono does

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 09a1144..51fdb6d 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -1965,7 +1965,7 @@ services:
   -
     name: network service - https
     check: check_https
-    hosts: franck, chopin, draghi, liszt, spohr, widor, tchaikovsky, grieg, vivaldi
+    hosts: franck, chopin, draghi, liszt, spohr, widor, tchaikovsky, grieg, vivaldi, nono
     depends: "process - apache2 - master"
     normal_check_interval: 120
   -
@@ -1976,26 +1976,14 @@ services:
     # spohr            rt.debian.org
     # tchaikovsky      nagios.debian.org
     # draghi           db.debian.org
-    # merkel2          nm.debian.org
+    # nono             nm.debian.org
     # liszt            lists.debian.org
     # grieg            buildd.debian.org
     # vivaldi          fossology.debian.org
-    hosts: franck, chopin, spohr, tchaikovsky, draghi, merkel2, liszt, widor, grieg, vivaldi
+    hosts: franck, chopin, spohr, tchaikovsky, draghi, nono, liszt, widor, grieg, vivaldi
     depends: network service - https
     normal_check_interval: 60
 
-  # merkel
-  -
-    name: network service - https
-    check: check_https
-    hosts: merkel2
-    depends: "merkel:process - apache2 - master"
-    normal_check_interval: 120
-  -
-    name: network service - http
-    check: check_http
-    hosts: merkel2
-    depends: "merkel:process - apache2 - master"
  ####
   -
     name: process - named