summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Monitoring/Makefile9
-rw-r--r--retiolum/Makefile1
-rw-r--r--retiolum/hosts/Styx1
-rw-r--r--retiolum/hosts/supernode1
4 files changed, 9 insertions, 3 deletions
diff --git a/Monitoring/Makefile b/Monitoring/Makefile
index 794f9262..4730f30d 100644
--- a/Monitoring/Makefile
+++ b/Monitoring/Makefile
@@ -1,6 +1,7 @@
NAGDIR = /etc/nagios3/
NAGLIBDIR = /usr/lib/nagios
HTDOCS = /usr/share/nagios3/htdocs
+KREBS = /krebs
.phony: debian
debian:
@@ -21,3 +22,11 @@ debian:
chown nagios:www-data /var/lib/nagios3/rw || true
chmod g+x /var/lib/nagios3 || true
chmod ugo=rwx /var/lib/nagios3/rw/nagios.cmd || true
+
+debian-shinken:
+ curl https://raw.github.com/nicolargo/shinkenautoinstall/master/shinkenautoinstall-debian.sh | sh
+
+shinken-discover-hosts: /etc/shinken/resources.cfg
+ sed -i '/.*NMAPTARGETS.*/d' /etc/shinken/resource.cfg
+ $(KREBS)/retiolum/bin/hosts | awk '{print $2}'| tr '\n' ' ' | xargs echo '$$NMAPTARGETS$$=' | magic create krebs-discovery /etc/shinken/resource.cfg
+ shinken-discovery -o /etc/shinken/objects/discovery
diff --git a/retiolum/Makefile b/retiolum/Makefile
index 8301c926..e0268c35 100644
--- a/retiolum/Makefile
+++ b/retiolum/Makefile
@@ -24,7 +24,6 @@ update: hosts
sudo bin/restart-tincd; \
else \
sudo pkill -HUP tincd || :; \
- sudo pkill -ALRM tincd || :; \
fi
arch-install: update install arch-autostart autohosts
diff --git a/retiolum/hosts/Styx b/retiolum/hosts/Styx
index b05eaac5..37083ddc 100644
--- a/retiolum/hosts/Styx
+++ b/retiolum/hosts/Styx
@@ -1,5 +1,4 @@
Subnet = 42.37.61.123/32
-Subnet = 0.0.0.0/0
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEA4jbOi+HZIGOGNm4aBSwnq4m3Vg3IXHmYUbJx1AzP4a/yvEgswfk6
MP5FXvoY/hZ0NQ0IRzbbJxGbcUdulz0WSjX1C+8uQUZstz+lvYZ4FeCXcdE5cuFM
diff --git a/retiolum/hosts/supernode b/retiolum/hosts/supernode
index e4698009..b046347e 100644
--- a/retiolum/hosts/supernode
+++ b/retiolum/hosts/supernode
@@ -1,7 +1,6 @@
Address = miefda.org
Subnet = 42:0:0:0:0:0:0:255/128
Subnet = 42.0.0.1/32
-Subnet = 0.0.0.0/0
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP
sShYqqN9Aj3iCqj/DHx5jGuSqjyTmmFWIOMM9IwKMo2Oiz/PcBM56N6gzIHuR5wj