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

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

1 files changed, 0 insertions, 16 deletions

diff --git a/Monitoring/nagios/shinken/objects/groups/root_contact.cfg b/Monitoring/nagios/shinken/objects/groups/root_contact.cfg
deleted file mode 100644
index a2c4180a..00000000
--- a/Monitoring/nagios/shinken/objects/groups/root_contact.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-define contact{
-    contact_name                    root
-    alias                           root
-    service_notification_period     24x7
-    host_notification_period        24x7
-    service_notification_options    w,u,c,r
-    host_notification_options       d,u,r
-    service_notification_commands   notify-service-by-email
-    host_notification_commands      notify-host-by-email
-    email                           root@krebsco.de
-    }
-define contactgroup{
-    contactgroup_name                 root-infrastructure
-    alias                             root-infrastructure
-    members                           root
-    }