merulo has moved

diff --git a/config/nagios-master.cfg b/config/nagios-master.cfg
index 40bbace..f552bc6 100644 (file)
--- a/config/nagios-master.cfg
+++ b/config/nagios-master.cfg
@@ -474,10 +474,6 @@ servers:
   #  address: 192.25.206.63
   #  parents: gw-ftcollins
   #  hostgroups: computers, buildd, acpid-hosts, wheezy
-  #merulo:
-  #  address: 192.25.206.58
-  #  parents: gw-ftcollins
-  #  hostgroups: computers, porterbox, hasusrfs, wheezy
   #mundy:
   #  address: 192.25.206.62
   #  parents: gw-ftcollins
@@ -667,6 +663,10 @@ servers:
 #    address: 140.211.166.58
 #    parents: gw-osuosl
 #    hostgroups: computers, buildd, hasbootfs
+  merulo:
+    address: 140.211.166.46
+    parents: gw-osuosl
+    hostgroups: computers, porterbox, hasusrfs, wheezy
   parry:
     address: 140.211.15.153
     parents: gw-osuosl