removed shack-modem from configs

conf/shack_ifrastructure.cfg: shack-modem is now an obsolete entry
conf/other_hosts.cfg: replaced modem with gw
conf/tinc_hosts.cfg: replaced modem with gw

3 files changed, 13 insertions, 21 deletions

diff --git a/Monitoring/conf/other_hosts.cfg b/Monitoring/conf/other_hosts.cfg
index bfc36154..bbdc676a 100644
--- a/Monitoring/conf/other_hosts.cfg
+++ b/Monitoring/conf/other_hosts.cfg
@@ -3,7 +3,7 @@ define host{
         host_name               google.de
         alias                   Google Website
         address                 google.de
-        parents                 shack-modem
+        parents                 shack-gw
         hostgroups              http-servers
         }
 
@@ -11,7 +11,6 @@ define host{
         use                     generic-host
         host_name               google-dns
         parents                 shack-gw
-        parents                 shack-modem
         alias                   Google DNS Service (always reachable)
         address                 8.8.8.8
         }
diff --git a/Monitoring/conf/shack_infrastructure.cfg b/Monitoring/conf/shack_infrastructure.cfg
index dd123dc3..565fecaf 100644
--- a/Monitoring/conf/shack_infrastructure.cfg
+++ b/Monitoring/conf/shack_infrastructure.cfg
@@ -31,14 +31,6 @@ define host{
         address                 10.42.0.12
         hostgroups              shack-rz,ssh-servers
         }
-define host{
-        use                     generic-host
-        host_name               shack-gauda0
-        parents                 shack-serverswitch
-        alias                   Shack gauda0 Mining Server
-        address                 gauda0.shack
-        hostgroups              shack-rz
-        }
 #
 # Network Infrastructure
 #
@@ -54,14 +46,15 @@ define host{
         address                 10.42.0.1
         hostgroups              shack-rz,ssh-servers
         }
-define host{
-        use                     generic-host
-        host_name               shack-modem
-        parents                 shack-gw
-        alias                   Shack Telecom VDSL Router
-        address                 192.168.2.1
-        hostgroups              shack-rz
-        }
+#deprecated
+#define host{
+#        use                     generic-host
+#        host_name               shack-modem
+#        parents                 shack-gw
+#        alias                   Shack Telecom VDSL Router
+#        address                 192.168.2.1
+#        hostgroups              shack-rz
+#        }
 define host{
         use                     generic-host
         host_name               shack-externswitch
diff --git a/Monitoring/conf/tinc_hosts.cfg b/Monitoring/conf/tinc_hosts.cfg
index 23c2b75e..4b1ad9ab 100644
--- a/Monitoring/conf/tinc_hosts.cfg
+++ b/Monitoring/conf/tinc_hosts.cfg
@@ -9,7 +9,7 @@ define host{
         alias                   Supernode External
         _TINC_ADDRESS           10.7.7.1
         address                 miefda.org
-        parents                 shack-modem
+        parents                 shack-gw
         hostgroups              tinc-nodes,ssh-servers,http-servers
         }
 
@@ -28,7 +28,7 @@ define host{
         alias                   PA Sharepoint
         address                 141.31.8.11
         _TINC_ADDRESS           10.7.7.5
-        parents                 shack-modem
+        parents                 shack-gw
         hostgroups              tinc-nodes,ssh-servers
         }
 #
@@ -40,6 +40,6 @@ define host{
         alias                   no_omo
         address                 leechi.kicks-ass.org
         _TINC_ADDRESS           10.7.7.111
-        parents                 shack-modem
+        parents                 shack-gw
         hostgroups              tinc-nodes,ssh-servers,http-servers
         }