From: mhoellein Date: Thu, 20 May 2021 04:25:02 +0000 (+0200) Subject: daily autocommit X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=c5507e0b7620ab8333221296df055a228f6cba52;p=vserver2 daily autocommit --- diff --git a/.etckeeper b/.etckeeper index 3acab71..f891b79 100755 --- a/.etckeeper +++ b/.etckeeper @@ -763,6 +763,7 @@ maybe chmod 0644 'icinga2/conf.d/users.conf' maybe chmod 0644 'icinga2/constants.conf' maybe chmod 0755 'icinga2/features-available' maybe chmod 0644 'icinga2/features-available/api.conf' +maybe chmod 0644 'icinga2/features-available/api.conf.orig' maybe chmod 0644 'icinga2/features-available/checker.conf' maybe chmod 0644 'icinga2/features-available/command.conf' maybe chmod 0644 'icinga2/features-available/compatlog.conf' @@ -782,6 +783,7 @@ maybe chown 'nagios' 'icinga2/features-enabled' maybe chgrp 'nagios' 'icinga2/features-enabled' maybe chmod 0750 'icinga2/features-enabled' maybe chmod 0644 'icinga2/icinga2.conf' +maybe chmod 0644 'icinga2/icinga2.conf.orig' maybe chown 'nagios' 'icinga2/pki' maybe chgrp 'nagios' 'icinga2/pki' maybe chmod 0700 'icinga2/pki' @@ -789,6 +791,7 @@ maybe chmod 0755 'icinga2/scripts' maybe chmod 0755 'icinga2/scripts/mail-host-notification.sh' maybe chmod 0755 'icinga2/scripts/mail-service-notification.sh' maybe chmod 0644 'icinga2/zones.conf' +maybe chmod 0644 'icinga2/zones.conf.orig' maybe chmod 0755 'icinga2/zones.d' maybe chmod 0644 'icinga2/zones.d/README' maybe chmod 0755 'init' diff --git a/icinga2/features-available/api.conf b/icinga2/features-available/api.conf index b072a44..8d85358 100644 --- a/icinga2/features-available/api.conf +++ b/icinga2/features-available/api.conf @@ -1,10 +1,7 @@ -/** - * The API listener is used for distributed monitoring setups. - */ +/** Icinga 2 Config - proposed by Icinga Director */ object ApiListener "api" { - //accept_config = false - //accept_commands = false - - ticket_salt = TicketSalt + accept_commands = true + accept_config = true } + diff --git a/icinga2/features-available/api.conf.orig b/icinga2/features-available/api.conf.orig new file mode 100644 index 0000000..b072a44 --- /dev/null +++ b/icinga2/features-available/api.conf.orig @@ -0,0 +1,10 @@ +/** + * The API listener is used for distributed monitoring setups. + */ + +object ApiListener "api" { + //accept_config = false + //accept_commands = false + + ticket_salt = TicketSalt +} diff --git a/icinga2/features-enabled/api.conf b/icinga2/features-enabled/api.conf new file mode 120000 index 0000000..8cdce62 --- /dev/null +++ b/icinga2/features-enabled/api.conf @@ -0,0 +1 @@ +../features-available/api.conf \ No newline at end of file diff --git a/icinga2/icinga2.conf b/icinga2/icinga2.conf index 17513a3..2f8e567 100644 --- a/icinga2/icinga2.conf +++ b/icinga2/icinga2.conf @@ -1,57 +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 include include include - -/** - * 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 - -/** - * This includes the NSClient++ check commands. These command definitions - * are required on a master node when a client is used as command endpoint. - */ include - -/** - * 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". - */ -include_recursive "conf.d" diff --git a/icinga2/icinga2.conf.orig b/icinga2/icinga2.conf.orig new file mode 100644 index 0000000..17513a3 --- /dev/null +++ b/icinga2/icinga2.conf.orig @@ -0,0 +1,57 @@ +/** + * 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. + */ + +/** + * The constants.conf defines global constants. + */ +include "constants.conf" + +/** + * The zones.conf defines zones for a cluster setup. + * Not required for single instance setups. + */ +include "zones.conf" + +/** + * The Icinga Template Library (ITL) provides a number of useful templates + * and command definitions. + * Common monitoring plugin command definitions are included separately. + */ +include +include +include +include + +/** + * 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 + +/** + * This includes the NSClient++ check commands. These command definitions + * are required on a master node when a client is used as command endpoint. + */ +include + +/** + * 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". + */ +include_recursive "conf.d" diff --git a/icinga2/zones.conf b/icinga2/zones.conf index 70ac766..8d590c7 100644 --- a/icinga2/zones.conf +++ b/icinga2/zones.conf @@ -1,63 +1,18 @@ -/* - * Endpoint and Zone configuration for a cluster setup - * This local example requires `NodeName` defined in - * constants.conf. - */ +/** Icinga 2 Config - proposed by Icinga Director */ -object Endpoint NodeName { - host = NodeName -} +object Endpoint "vserver2.hoellein.online" {} -object Zone ZoneName { - endpoints = [ NodeName ] +object Zone "vserver2.hoellein.online" { + parent = "mail.hoellein.online" + endpoints = [ "vserver2.hoellein.online" ] } -/* - * Defines a global zone for distributed setups with masters, - * satellites and clients. - * This is required to sync configuration commands, - * templates, apply rules, etc. to satellite and clients. - * All nodes require the same configuration and must - * have `accept_config` enabled in the `api` feature. - */ - -object Zone "global-templates" { - global = true +object Zone "mail.hoellein.online" { + endpoints = [ "mail.hoellein.online" ] +} +object Endpoint "mail.hoellein.online" { + host = "mail.hoellein.online" } - -/* - * Defines a global zone for the Icinga Director. - * This is required to sync configuration commands, - * templates, apply rules, etc. to satellite and clients. - * All nodes require the same configuration and must - * have `accept_config` enabled in the `api` feature. - */ - object Zone "director-global" { global = true } - -/* - * Read the documentation on how to configure - * a cluster setup with multiple zones. - */ - -/* -object Endpoint "master.example.org" { - host = "master.example.org" -} - -object Endpoint "satellite.example.org" { - host = "satellite.example.org" -} - -object Zone "master" { - endpoints = [ "master.example.org" ] -} - -object Zone "satellite" { - parent = "master" - endpoints = [ "satellite.example.org" ] -} -*/ - diff --git a/icinga2/zones.conf.orig b/icinga2/zones.conf.orig new file mode 100644 index 0000000..70ac766 --- /dev/null +++ b/icinga2/zones.conf.orig @@ -0,0 +1,63 @@ +/* + * Endpoint and Zone configuration for a cluster setup + * This local example requires `NodeName` defined in + * constants.conf. + */ + +object Endpoint NodeName { + host = NodeName +} + +object Zone ZoneName { + endpoints = [ NodeName ] +} + +/* + * Defines a global zone for distributed setups with masters, + * satellites and clients. + * This is required to sync configuration commands, + * templates, apply rules, etc. to satellite and clients. + * All nodes require the same configuration and must + * have `accept_config` enabled in the `api` feature. + */ + +object Zone "global-templates" { + global = true +} + +/* + * Defines a global zone for the Icinga Director. + * This is required to sync configuration commands, + * templates, apply rules, etc. to satellite and clients. + * All nodes require the same configuration and must + * have `accept_config` enabled in the `api` feature. + */ + +object Zone "director-global" { + global = true +} + +/* + * Read the documentation on how to configure + * a cluster setup with multiple zones. + */ + +/* +object Endpoint "master.example.org" { + host = "master.example.org" +} + +object Endpoint "satellite.example.org" { + host = "satellite.example.org" +} + +object Zone "master" { + endpoints = [ "master.example.org" ] +} + +object Zone "satellite" { + parent = "master" + endpoints = [ "satellite.example.org" ] +} +*/ +