daily autocommit

diff --git a/.etckeeper b/.etckeeper
index 21c5f2c244062a95b3aa97390693011087f91627..68892787d099441250c8fe251d3de9b3f168e39c 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -996,7 +996,10 @@ maybe chgrp 'nagios' 'icinga2/conf.d/users.conf'
 maybe chmod 0644 'icinga2/conf.d/users.conf'
 maybe chown 'nagios' 'icinga2/constants.conf'
 maybe chgrp 'nagios' 'icinga2/constants.conf'
-maybe chmod 0640 'icinga2/constants.conf'
+maybe chmod 0644 'icinga2/constants.conf'
+maybe chown 'nagios' 'icinga2/constants.conf.orig'
+maybe chgrp 'nagios' 'icinga2/constants.conf.orig'
+maybe chmod 0640 'icinga2/constants.conf.orig'
 maybe chown 'nagios' 'icinga2/features-available'
 maybe chgrp 'nagios' 'icinga2/features-available'
 maybe chmod 0750 'icinga2/features-available'
@@ -1062,7 +1065,7 @@ maybe chgrp 'nagios' 'icinga2/features-enabled'
 maybe chmod 0750 'icinga2/features-enabled'
 maybe chown 'nagios' 'icinga2/icinga2.conf'
 maybe chgrp 'nagios' 'icinga2/icinga2.conf'
-maybe chmod 0640 'icinga2/icinga2.conf'
+maybe chmod 0644 'icinga2/icinga2.conf'
 maybe chmod 0644 'icinga2/icinga2.conf.orig'
 maybe chown 'nagios' 'icinga2/pki'
 maybe chgrp 'nagios' 'icinga2/pki'
@@ -1072,7 +1075,7 @@ maybe chmod 0755 'icinga2/scripts/mail-host-notification.sh'
 maybe chmod 0755 'icinga2/scripts/mail-service-notification.sh'
 maybe chown 'nagios' 'icinga2/zones.conf'
 maybe chgrp 'nagios' 'icinga2/zones.conf'
-maybe chmod 0640 'icinga2/zones.conf'
+maybe chmod 0644 'icinga2/zones.conf'
 maybe chmod 0644 'icinga2/zones.conf.orig'
 maybe chown 'nagios' 'icinga2/zones.d'
 maybe chgrp 'nagios' 'icinga2/zones.d'

diff --git a/icinga2/constants.conf b/icinga2/constants.conf
index 29232d618e56f5e33de9e462583c3802e9e8a62d..a665fe27fcc2fff266be6cdad4de682be21beddb 100644 (file)
--- a/icinga2/constants.conf
+++ b/icinga2/constants.conf
@@ -19,10 +19,10 @@ const PluginContribDir = "/usr/lib/nagios/plugins"
 /* Our local instance name. By default this is the server's hostname as returned by `hostname --fqdn`.
  * This should be the common name from the API certificate.
  */
-//const NodeName = "localhost"
+const NodeName = "vserver2.hoellein.online"
 
 /* Our local zone name. */
-const ZoneName = NodeName
+const ZoneName = "vserver2.hoellein.online"
 
 /* Secret key for remote node tickets */
 const TicketSalt = ""

diff --git a/icinga2/constants.conf.orig b/icinga2/constants.conf.orig
new file mode 100644 (file)
index 0000000..29232d6
--- /dev/null
+++ b/icinga2/constants.conf.orig
@@ -0,0 +1,28 @@
+/**
+ * This file defines global constants which can be used in
+ * the other configuration files.
+ */
+
+/* The directory which contains the plugins from the Monitoring Plugins project. */
+const PluginDir = "/usr/lib/nagios/plugins"
+
+/* The directory which contains the Manubulon plugins.
+ * Check the documentation, chapter "SNMP Manubulon Plugin Check Commands", for details.
+ */
+const ManubulonPluginDir = "/usr/lib/nagios/plugins"
+
+/* The directory which you use to store additional plugins which ITL provides user contributed command definitions for.
+ * Check the documentation, chapter "Plugins Contribution", for details.
+ */
+const PluginContribDir = "/usr/lib/nagios/plugins"
+
+/* Our local instance name. By default this is the server's hostname as returned by `hostname --fqdn`.
+ * This should be the common name from the API certificate.
+ */
+//const NodeName = "localhost"
+
+/* Our local zone name. */
+const ZoneName = NodeName
+
+/* Secret key for remote node tickets */
+const TicketSalt = ""

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

diff --git a/icinga2/features-enabled/notification.conf b/icinga2/features-enabled/notification.conf
deleted file mode 120000 (symlink)
index c31d3b4..0000000
--- a/icinga2/features-enabled/notification.conf
+++ /dev/null
@@ -1 +0,0 @@
-../features-available/notification.conf
\ No newline at end of file

diff --git a/icinga2/zones.conf b/icinga2/zones.conf
index 8d590c78baf62020c165b9cb355131a49c8d06dd..043895fbfb9578cc6dbd75ae9e8cbb273596c912 100644 (file)
--- a/icinga2/zones.conf
+++ b/icinga2/zones.conf
@@ -1,18 +1,31 @@
-/** Icinga 2 Config - proposed by Icinga Director */
+/*
+ * Generated by Icinga 2 node setup commands
+ * on 2023-05-25 13:10:24 +0200
+ */
 
-object Endpoint "vserver2.hoellein.online" {}
+object Endpoint "mail.hoellein.online" {
+       host = "mail.hoellein.online"
+       port = "5665"
+}
 
-object Zone "vserver2.hoellein.online" {
-  parent = "mail.hoellein.online"
-  endpoints = [ "vserver2.hoellein.online" ]
+object Zone "master" {
+       endpoints = [ "mail.hoellein.online" ]
 }
 
-object Zone "mail.hoellein.online" {
-  endpoints = [ "mail.hoellein.online" ]
+object Endpoint "vserver2.hoellein.online" {
 }
-object Endpoint "mail.hoellein.online" {
-  host = "mail.hoellein.online"
+
+object Zone "vserver2.hoellein.online" {
+       endpoints = [ "vserver2.hoellein.online" ]
+       parent = "master"
 }
+
+object Zone "global-templates" {
+       global = true
+}
+
 object Zone "director-global" {
-  global = true
+       global = true
 }
+
+