Merge branch 'master' of github.com:krebscode/painload

Conflicts:
	god/temper/Makefile
	god/temper/collectd-temper.sh

1 files changed, 33 insertions, 0 deletions

diff --git a/god/Monitoring/nagios/conf/tinc_hosts.cfg b/god/Monitoring/nagios/conf/tinc_hosts.cfg
new file mode 100644
index 00000000..717c75a8
--- /dev/null
+++ b/god/Monitoring/nagios/conf/tinc_hosts.cfg
@@ -0,0 +1,33 @@
+#connection will not work if no internet is available (e.g. no shack-gateway)
+
+#
+# Miefda Supernode
+#
+define host{
+        use                     generic-host
+        host_name               supernode
+        alias                   Supernode External
+        _TINC_ADDRESS           10.7.7.1
+        address                 miefda.org
+        parents                 shack-gw
+        hostgroups              tinc-nodes,ssh-servers,http-servers
+        }
+
+define service {
+        host_name                 supernode
+        service_description       IRC
+        use                       generic-service
+        check_command             check_ircd
+        }
+#
+# Sharepoint (dhbw-stuttgart)
+#
+define host{
+        use                     generic-host
+        host_name               sharepoint
+        alias                   PA Sharepoint
+        address                 141.31.8.11
+        _TINC_ADDRESS           10.7.7.5
+        parents                 shack-gw
+        hostgroups              tinc-nodes,ssh-servers
+        }