daily autocommit

diff --git a/icinga2/zones.conf b/icinga2/zones.conf
index a681279baf22d934cd20476c9e365982370f7e6d..277dd7322c6062b42a66e7dc29f63a7a0c6472da 100644 (file)
--- a/icinga2/zones.conf
+++ b/icinga2/zones.conf
@@ -21,16 +21,16 @@ object Endpoint "ns3.uhu-banane.de" {
         port = "5665"
 }
 
-# object Endpoint "helga.uhu-banane.de" {
-#         host = "helga.uhu-banane.de"
-#         port = "5665"
-# }
-
-object Endpoint "sarah.uhu-banane.de" {
-        host = "sarah.uhu-banane.de"
+object Endpoint "helga.uhu-banane.de" {
+        host = "helga.uhu-banane.de"
         port = "5665"
 }
 
+# object Endpoint "sarah.uhu-banane.de" {
+#         host = "sarah.uhu-banane.de"
+#         port = "5665"
+# }
+
 object Zone "ns2.uhu-banane.de" {
         endpoints = [ "ns2.uhu-banane.de" ]
         parent = "master"
@@ -41,16 +41,16 @@ object Zone "ns3.uhu-banane.de" {
         parent = "master"
 }
 
-# object Zone "helga.uhu-banane.de" {
-#         endpoints = [ "helga.uhu-banane.de" ]
-#         parent = "master"
-# }
-
-object Zone "sarah.uhu-banane.de" {
-        endpoints = [ "sarah.uhu-banane.de" ]
+object Zone "helga.uhu-banane.de" {
+        endpoints = [ "helga.uhu-banane.de" ]
         parent = "master"
 }
 
+# object Zone "sarah.uhu-banane.de" {
+#         endpoints = [ "sarah.uhu-banane.de" ]
+#         parent = "master"
+# }
+
 object Zone "global-templates" {
         global = true
 }

diff --git a/icinga2/zones.d/master/hosts.conf b/icinga2/zones.d/master/hosts.conf
index 2a0fa11571fa59a61320747c25a43884cf077178..68e9d20a37ed7e3089f4e72a4f9ec1b7db06ac99 100644 (file)
--- a/icinga2/zones.d/master/hosts.conf
+++ b/icinga2/zones.d/master/hosts.conf
@@ -92,99 +92,30 @@ object Host "ns3.uhu-banane.de" {
   vars.client_endpoint = name //follows the convention that host name == endpoint name
 }
 
-# object Host "helga.uhu-banane.de" {
-#   # check_command = "hostalive" //check is executed on the master
-#   check_command = "ssh" //check is executed on the master
-#   address = "188.34.187.246"
-# 
-#   vars.os = "Linux"
-#   vars.os_family = "Debian"
-#   # All about DNS server
-#   vars.is_ns = true
-# 
-#   vars.is_mta = true
-# 
-#   vars.mailq_warning = 100
-#   vars.mailq_critical = 300
-# 
-#   # vars.smtp_address = "mail.uhu-banane.net"
-#   vars.smtp_address = "mail.brehm-berlin.de"
-#   vars.smtp_port = 25
-#   vars.smtp_helo_fqdn = "icinga2.uhu-banane.de"
-#   vars.smtp_starttls = true
-# 
-#   vars.is_imap_server = true
-# 
-#   vars.imap_address = "mail.brehm-berlin.de"
-#   vars.imap_port = 993
-#   vars.imap_ssl = true
-#   vars.imap_ipv4 = true
-# 
-#   /* Define http vhost attributes for service apply rules in `services.conf`. */
-#   vars.http_vhosts["http"] = {
-#     http_uri = "/"
-#   }
-# 
-#   /* Define disks and attributes for service apply rules in `services.conf`. */
-#   vars.disks["disk"] = {
-#     /* No parameters. */
-#   }
-# 
-#   vars.disks["disk /"] = {
-#     disk_partitions = "/"
-#   }
-# 
-#   vars.disks["disk /home"] = {
-#     disk_partitions = "/home"
-#   }
-# 
-#   vars.disks["disk /opt"] = {
-#     disk_partitions = "/opt"
-#   }
-# 
-#   vars.disks["disk /var/backup"] = {
-#     disk_partitions = "/var/backup"
-#   }
-# 
-#   vars.disks["disk /var/vmail"] = {
-#     disk_partitions = "/var/vmail"
-#   }
-# 
-#   vars.disks["disk /var/lib/mysql"] = {
-#     disk_partitions = "/var/lib/mysql"
-#   }
-# 
-#   /* Define notification mail attributes for notification apply rules in `notifications.conf`. */
-#   vars.notification["mail"] = {
-#     /* The UserGroup `icingaadmins` is defined in `users.conf`. */
-#     groups = [ "icingaadmins" ]
-#   }
-#   vars.client_endpoint = name //follows the convention that host name == endpoint name
-#   # vars.client_endpoint = "helga.uhu-banane.de"
-# }
-
-object Host "sarah.uhu-banane.de" {
+object Host "helga.uhu-banane.de" {
   check_command = "hostalive" //check is executed on the master
-  address = "185.48.118.130"
+  # check_command = "ssh" //check is executed on the master
+  address = "188.34.187.246"
 
   vars.os = "Linux"
   vars.os_family = "Debian"
   # All about DNS server
-  vars.is_ns = false
+  vars.is_ns = true
 
   vars.is_mta = true
 
   vars.mailq_warning = 100
   vars.mailq_critical = 300
 
-  vars.smtp_address = "mail.uhu-banane.net"
+  # vars.smtp_address = "mail.uhu-banane.net"
+  vars.smtp_address = "mail.brehm-berlin.de"
   vars.smtp_port = 25
   vars.smtp_helo_fqdn = "icinga2.uhu-banane.de"
   vars.smtp_starttls = true
 
   vars.is_imap_server = true
 
-  vars.imap_address = "mail.uhu-banane.net"
+  vars.imap_address = "mail.brehm-berlin.de"
   vars.imap_port = 993
   vars.imap_ssl = true
   vars.imap_ipv4 = true
@@ -198,18 +129,14 @@ object Host "sarah.uhu-banane.de" {
   vars.disks["disk"] = {
     /* No parameters. */
   }
+
   vars.disks["disk /"] = {
     disk_partitions = "/"
   }
+
   vars.disks["disk /home"] = {
     disk_partitions = "/home"
   }
-  vars.disks["disk /tmp"] = {
-    disk_partitions = "/tmp"
-  }
-  vars.disks["disk /var"] = {
-    disk_partitions = "/var"
-  }
 
   vars.disks["disk /opt"] = {
     disk_partitions = "/opt"
@@ -219,11 +146,84 @@ object Host "sarah.uhu-banane.de" {
     disk_partitions = "/var/backup"
   }
 
+  vars.disks["disk /var/vmail"] = {
+    disk_partitions = "/var/vmail"
+  }
+
+  vars.disks["disk /var/lib/mysql"] = {
+    disk_partitions = "/var/lib/mysql"
+  }
+
   /* Define notification mail attributes for notification apply rules in `notifications.conf`. */
   vars.notification["mail"] = {
     /* The UserGroup `icingaadmins` is defined in `users.conf`. */
     groups = [ "icingaadmins" ]
   }
   vars.client_endpoint = name //follows the convention that host name == endpoint name
+  # vars.client_endpoint = "helga.uhu-banane.de"
 }
 
+# object Host "sarah.uhu-banane.de" {
+#   check_command = "hostalive" //check is executed on the master
+#   address = "185.48.118.130"
+# 
+#   vars.os = "Linux"
+#   vars.os_family = "Debian"
+#   # All about DNS server
+#   vars.is_ns = false
+# 
+#   vars.is_mta = true
+# 
+#   vars.mailq_warning = 100
+#   vars.mailq_critical = 300
+# 
+#   vars.smtp_address = "mail.uhu-banane.net"
+#   vars.smtp_port = 25
+#   vars.smtp_helo_fqdn = "icinga2.uhu-banane.de"
+#   vars.smtp_starttls = true
+# 
+#   vars.is_imap_server = true
+# 
+#   vars.imap_address = "mail.uhu-banane.net"
+#   vars.imap_port = 993
+#   vars.imap_ssl = true
+#   vars.imap_ipv4 = true
+# 
+#   /* Define http vhost attributes for service apply rules in `services.conf`. */
+#   vars.http_vhosts["http"] = {
+#     http_uri = "/"
+#   }
+# 
+#   /* Define disks and attributes for service apply rules in `services.conf`. */
+#   vars.disks["disk"] = {
+#     /* No parameters. */
+#   }
+#   vars.disks["disk /"] = {
+#     disk_partitions = "/"
+#   }
+#   vars.disks["disk /home"] = {
+#     disk_partitions = "/home"
+#   }
+#   vars.disks["disk /tmp"] = {
+#     disk_partitions = "/tmp"
+#   }
+#   vars.disks["disk /var"] = {
+#     disk_partitions = "/var"
+#   }
+# 
+#   vars.disks["disk /opt"] = {
+#     disk_partitions = "/opt"
+#   }
+# 
+#   vars.disks["disk /var/backup"] = {
+#     disk_partitions = "/var/backup"
+#   }
+# 
+#   /* Define notification mail attributes for notification apply rules in `notifications.conf`. */
+#   vars.notification["mail"] = {
+#     /* The UserGroup `icingaadmins` is defined in `users.conf`. */
+#     groups = [ "icingaadmins" ]
+#   }
+#   vars.client_endpoint = name //follows the convention that host name == endpoint name
+# }
+