daily autocommit

diff --git a/icinga2/features-available/api.conf b/icinga2/features-available/api.conf
index 3270a913df485dd810efa3002206a9112fdc38fb..8d85358a5ed2f54e0cb84013011a83eecfd6596f 100644 (file)
--- a/icinga2/features-available/api.conf
+++ b/icinga2/features-available/api.conf
@@ -1,9 +1,7 @@
-/**
- * The API listener is used for distributed monitoring setups.
- */
+/** Icinga 2 Config - proposed by Icinga Director */
+
 object ApiListener "api" {
-  accept_config = true
   accept_commands = true
-  bind_host = "mail.hoellein.online"
-  bind_port = 5665
+  accept_config = true
 }
+

diff --git a/icinga2/icinga2.conf b/icinga2/icinga2.conf
index d32f4c7113d9b3690b364cef4c1f0196f0f95a23..2f8e567b4655e9a01fae9c6cde05e607e9e55694 100644 (file)
--- a/icinga2/icinga2.conf
+++ b/icinga2/icinga2.conf
@@ -1,62 +1,15 @@
-/**
- * Icinga 2 configuration file
- * - this is where you define settings for the Icinga application including
- * which hosts/services to check.
- *
- * For an overview of all available configuration options please refer
- * to the documentation that is distributed as part of Icinga 2.
- */
+/** Icinga 2 Config - proposed by Icinga Director */
 
-/**
- * The constants.conf defines global constants.
- */
 include "constants.conf"
 
-/**
- * The zones.conf defines zones for a cluster setup.
- * Not required for single instance setups.
- */
+const NodeName = "vserver2.hoellein.online"
+
 include "zones.conf"
+include "features-enabled/*.conf"
 
-/**
- * The Icinga Template Library (ITL) provides a number of useful templates
- * and command definitions.
- * Common monitoring plugin command definitions are included separately.
- */
 include <itl>
 include <plugins>
 include <plugins-contrib>
 include <manubulon>
-
-/**
- * This includes the Icinga 2 Windows plugins. These command definitions
- * are required on a master node when a client is used as command endpoint.
- */
 include <windows-plugins>
-
-/**
- * This includes the NSClient++ check commands. These command definitions
- * are required on a master node when a client is used as command endpoint.
- */
 include <nscp>
-
-/**
- * The features-available directory contains a number of configuration
- * files for features which can be enabled and disabled using the
- * icinga2 feature enable / icinga2 feature disable CLI commands.
- * These commands work by creating and removing symbolic links in
- * the features-enabled directory.
- */
-include "features-enabled/*.conf"
-
-/**
- * Although in theory you could define all your objects in this file
- * the preferred way is to create separate directories and files in the conf.d
- * directory. Each of these files must have the file extension ".conf".
- */
-// Disabled by the node setup CLI command on 2023-05-26 11:47:29 +0200
-// Disabled by the node setup CLI command on 2023-05-26 11:54:18 +0200
-// Disabled by the node setup CLI command on 2023-05-26 11:57:21 +0200
-// Disabled by the node setup CLI command on 2023-05-26 12:12:42 +0200
-// Disabled by the node setup CLI command on 2023-05-26 12:13:42 +0200
-// include_recursive "conf.d"

diff --git a/icinga2/zones.conf b/icinga2/zones.conf
index 482d0c5838048ff999493c67dcd94c1b255c634f..8d590c78baf62020c165b9cb355131a49c8d06dd 100644 (file)
--- a/icinga2/zones.conf
+++ b/icinga2/zones.conf
@@ -1,29 +1,18 @@
-/*
- * Generated by Icinga 2 node setup commands
- * on 2023-05-26 12:13:40 +0200
- */
+/** Icinga 2 Config - proposed by Icinga Director */
 
-object Endpoint "mail.hoellein.online" {
-}
-
-object Zone "mail.hoellein.online" {
-       endpoints = [ "mail.hoellein.online" ]
-}
-
-object Endpoint "vserver2.hoellein.online" {
-}
+object Endpoint "vserver2.hoellein.online" {}
 
 object Zone "vserver2.hoellein.online" {
-       endpoints = [ "vserver2.hoellein.online" ]
-       parent = "mail.hoellein.online"
+  parent = "mail.hoellein.online"
+  endpoints = [ "vserver2.hoellein.online" ]
 }
 
-object Zone "global-templates" {
-       global = true
+object Zone "mail.hoellein.online" {
+  endpoints = [ "mail.hoellein.online" ]
+}
+object Endpoint "mail.hoellein.online" {
+  host = "mail.hoellein.online"
 }
-
 object Zone "director-global" {
-       global = true
+  global = true
 }
-
-