projects
/
mirror
/
dsa-nagios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
[mirror/dsa-nagios.git]
/
config
/
nagios-master.cfg
diff --git
a/config/nagios-master.cfg
b/config/nagios-master.cfg
index
b5997ed
..
bc2772c
100644
(file)
--- a/
config/nagios-master.cfg
+++ b/
config/nagios-master.cfg
@@
-77,7
+77,7
@@
servers:
parents: gw-ubc
hostgroups: routing-infrastructure
gw-sanger:
parents: gw-ubc
hostgroups: routing-infrastructure
gw-sanger:
- address: 193.62.202.
18
+ address: 193.62.202.
20
parents: gw-ubc
hostgroups: routing-infrastructure
contacts: tjrc1
parents: gw-ubc
hostgroups: routing-infrastructure
contacts: tjrc1
@@
-173,7
+173,8
@@
servers:
parents: gw-ubc
hostgroups: routing-infrastructure
gw-ynic:
parents: gw-ubc
hostgroups: routing-infrastructure
gw-ynic:
- address: 144.32.168.65
+ # really janet, because ynic is stupid about firewalling
+ address: 146.97.42.26
parents: gw-ubc
hostgroups: routing-infrastructure
parents: gw-ubc
hostgroups: routing-infrastructure
@@
-311,10
+312,10
@@
servers:
address: 140.211.166.78
parents: gw-osuosl
hostgroups: computers, buildd, hasbootfs
address: 140.211.166.78
parents: gw-osuosl
hostgroups: computers, buildd, hasbootfs
- mayr:
- address: 140.211.166.58
- parents: gw-osuosl
- hostgroups: computers, buildd, hasbootfs
+
#
mayr:
+
#
address: 140.211.166.58
+
#
parents: gw-osuosl
+
#
hostgroups: computers, buildd, hasbootfs
rietz:
address: 140.211.166.43
parents: gw-osuosl
rietz:
address: 140.211.166.43
parents: gw-osuosl
@@
-506,6
+507,7
@@
servers:
hostgroups: computers, bl460, acpid-hosts
tchaikovsky:
address: 206.12.19.118
hostgroups: computers, bl460, acpid-hosts
tchaikovsky:
address: 206.12.19.118
+ address6: 2607:f8f0:610:4000:216:36ff:fe40:3809
hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains
wolkenstein:
address: 206.12.19.116
hostgroups: computers, general, apache2-hosts, hasbootfs, kvmdomains
wolkenstein:
address: 206.12.19.116