Remove draghi from nagiosmaster, create a extranrpeclient thing

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 49307fbfcbd58e37d696e0524c264ce7cba42d99..00a3051be63c604a352f6ce6051ca2e5407cd831 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -116,8 +116,8 @@ services:
     - spohr.debian.org
     - merikanto.debian.org
   muninmaster: spohr.debian.org
-  nagiosmaster:
-    - draghi.debian.org
+  nagiosmaster: draghi.debian.org
+  extranrpeclient:
     - tchaikovsky.debian.org
   packagesmaster: powell.debian.org
   packagesqamaster: master.debian.org

diff --git a/modules/ferm/templates/defs.conf.erb b/modules/ferm/templates/defs.conf.erb
index cd898100aaee9bb5e25734d3c61e0b4369160a50..35fb7a1abb20fbdb88031082c5a6fa35f58e342f 100644 (file)
--- a/modules/ferm/templates/defs.conf.erb
+++ b/modules/ferm/templates/defs.conf.erb
@@ -48,7 +48,7 @@
 @def $HOST_NAGIOS_V4 = (<%=
   nagii = []
   localinfo.keys.sort.each do |node|
-      if localinfo[node]['nagiosmaster']
+      if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
           keyinfo[node][0]['ipHostNumber'].each do |ip|
              next if ip =~ /:/
              nagii << ip
@@ -62,7 +62,7 @@
 @def $HOST_NAGIOS_V6 = (<%=
   nagii = []
   localinfo.keys.sort.each do |node|
-      if localinfo[node]['nagiosmaster']
+      if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
           keyinfo[node][0]['ipHostNumber'].each do |ip|
              next if ip =~ /\./
              nagii << ip

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index 0f8952ab8c3cf2e5f63f39ef6d71a732b3e79721..b8a26d696693bd3746e96d14fc9e3073e6ec3ebf 100644 (file)
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -6,7 +6,7 @@
 <%=
 nagii = []
 localinfo.keys.sort.each do |node|
-  if localinfo[node]['nagiosmaster']
+  if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
     nagii << keyinfo[node][0]['ipHostNumber']
   end
 end