From 9a60c1a790db10aa0865bba42ee6c8def0edb157 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 15 Apr 2021 21:10:02 +0200 Subject: [PATCH] daily autocommit --- .etckeeper | 6 +- amavis/conf.d/50-user | 3 +- icinga2/constants.conf | 2 +- ...constants.conf.orig => constants.conf.bla} | 4 +- icinga2/features-available/api.conf | 4 +- icinga2/features-available/api.conf.orig | 11 ---- icinga2/icinga2.conf | 3 +- icinga2/icinga2.conf.orig | 63 +++++++++++++++++++ icinga2/zones.conf | 49 ++++++++++++--- icinga2/zones.conf.bla | 31 +++++++++ icinga2/zones.conf.orig | 51 --------------- motd | 6 +- 12 files changed, 150 insertions(+), 83 deletions(-) rename icinga2/{constants.conf.orig => constants.conf.bla} (92%) delete mode 100644 icinga2/features-available/api.conf.orig create mode 100644 icinga2/icinga2.conf.orig create mode 100644 icinga2/zones.conf.bla delete mode 100644 icinga2/zones.conf.orig diff --git a/.etckeeper b/.etckeeper index 43be8ac..d4c09b5 100755 --- a/.etckeeper +++ b/.etckeeper @@ -915,10 +915,9 @@ maybe chmod 0644 'icinga2/conf.d/templates.conf' maybe chmod 0644 'icinga2/conf.d/timeperiods.conf' maybe chmod 0644 'icinga2/conf.d/users.conf' maybe chmod 0644 'icinga2/constants.conf' -maybe chmod 0644 'icinga2/constants.conf.orig' +maybe chmod 0644 'icinga2/constants.conf.bla' 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' @@ -936,6 +935,7 @@ maybe chmod 0644 'icinga2/features-available/statusdata.conf' maybe chmod 0644 'icinga2/features-available/syslog.conf' maybe chmod 0755 'icinga2/features-enabled' maybe chmod 0644 'icinga2/icinga2.conf' +maybe chmod 0644 'icinga2/icinga2.conf.orig' maybe chmod 0644 'icinga2/init.conf' maybe chown 'nagios' 'icinga2/pki' maybe chgrp 'nagios' 'icinga2/pki' @@ -954,7 +954,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 0644 'icinga2/zones.conf.bla' maybe chmod 0755 'icinga2/zones.d' maybe chmod 0644 'icinga2/zones.d/README' maybe chmod 0755 'init' diff --git a/amavis/conf.d/50-user b/amavis/conf.d/50-user index f970870..871e9a4 100644 --- a/amavis/conf.d/50-user +++ b/amavis/conf.d/50-user @@ -248,7 +248,8 @@ $signed_header_fields{'to'} = 1; dkim_key("brehm-berlin.de", "dkim", "/var/lib/dkim/uhu-banane.net.pem"); dkim_key("brehm-online.com", "dkim", "/var/lib/dkim/uhu-banane.net.pem"); dkim_key("brehm-online.eu", "dkim", "/var/lib/dkim/uhu-banane.net.pem"); -dkim_key("frankepedia.eu", "mail-2017-04-05", "/var/lib/dkim/frankepedia.eu.2017-04-05.pem"); +# dkim_key("frankepedia.eu", "mail-2017-04-05", "/var/lib/dkim/frankepedia.eu.2017-04-05.pem"); +dkim_key("frankepedia.eu", "dkim", "/var/lib/dkim/uhu-banane.net.pem"); dkim_key("hennig-berlin.org", "dkim", "/var/lib/dkim/uhu-banane.net.pem"); dkim_key("uhu-banane.com", "dkim", "/var/lib/dkim/uhu-banane.net.pem"); dkim_key("uhu-banane.de", "dkim", "/var/lib/dkim/uhu-banane.net.pem"); diff --git a/icinga2/constants.conf b/icinga2/constants.conf index f904327..1aba769 100644 --- a/icinga2/constants.conf +++ b/icinga2/constants.conf @@ -22,7 +22,7 @@ const PluginContribDir = "/usr/lib/nagios/plugins" const NodeName = "sarah.uhu-banane.de" /* Our local zone name. */ -const ZoneName = "sarah.uhu-banane.de" +const ZoneName = NodeName /* Secret key for remote node tickets */ const TicketSalt = "" diff --git a/icinga2/constants.conf.orig b/icinga2/constants.conf.bla similarity index 92% rename from icinga2/constants.conf.orig rename to icinga2/constants.conf.bla index 29232d6..f904327 100644 --- a/icinga2/constants.conf.orig +++ b/icinga2/constants.conf.bla @@ -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 = "sarah.uhu-banane.de" /* Our local zone name. */ -const ZoneName = NodeName +const ZoneName = "sarah.uhu-banane.de" /* Secret key for remote node tickets */ const TicketSalt = "" diff --git a/icinga2/features-available/api.conf b/icinga2/features-available/api.conf index be8acf3..0136de0 100644 --- a/icinga2/features-available/api.conf +++ b/icinga2/features-available/api.conf @@ -1,13 +1,11 @@ /** * The API listener is used for distributed monitoring setups. */ + object ApiListener "api" { cert_path = SysconfDir + "/icinga2/pki/" + NodeName + ".crt" key_path = SysconfDir + "/icinga2/pki/" + NodeName + ".key" ca_path = SysconfDir + "/icinga2/pki/ca.crt" - accept_config = true - accept_commands = true - ticket_salt = TicketSalt } diff --git a/icinga2/features-available/api.conf.orig b/icinga2/features-available/api.conf.orig deleted file mode 100644 index 0136de0..0000000 --- a/icinga2/features-available/api.conf.orig +++ /dev/null @@ -1,11 +0,0 @@ -/** - * The API listener is used for distributed monitoring setups. - */ - -object ApiListener "api" { - cert_path = SysconfDir + "/icinga2/pki/" + NodeName + ".crt" - key_path = SysconfDir + "/icinga2/pki/" + NodeName + ".key" - ca_path = SysconfDir + "/icinga2/pki/ca.crt" - - ticket_salt = TicketSalt -} diff --git a/icinga2/icinga2.conf b/icinga2/icinga2.conf index 019072f..b9e14ba 100644 --- a/icinga2/icinga2.conf +++ b/icinga2/icinga2.conf @@ -60,4 +60,5 @@ include_recursive "repository.d" * 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" +// Disabled by the node setup CLI command on 2021-04-15 13:31:09 +0200 +// include_recursive "conf.d" diff --git a/icinga2/icinga2.conf.orig b/icinga2/icinga2.conf.orig new file mode 100644 index 0000000..019072f --- /dev/null +++ b/icinga2/icinga2.conf.orig @@ -0,0 +1,63 @@ +/** + * 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" + +/** + * The repository.d directory contains all configuration objects + * managed by the 'icinga2 repository' CLI commands. + */ +include_recursive "repository.d" + +/** + * 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 0879957..df773e4 100644 --- a/icinga2/zones.conf +++ b/icinga2/zones.conf @@ -1,23 +1,58 @@ /* - * Generated by Icinga 2 node setup commands - * on 2017-10-13 15:55:47 +0200 + * Endpoint and Zone configuration for a cluster setup + * This local example requires `NodeName` defined in + * constants.conf. */ object Endpoint "ns1.uhu-banane.de" { - host = "ns1.uhu-banane.de" - port = "5665" } object Zone "master" { - endpoints = [ "ns1.uhu-banane.de" ] + endpoints = [ "ns1.uhu-banane.de" ] } object Endpoint NodeName { } object Zone ZoneName { - endpoints = [ NodeName ] - parent = "master" + endpoints = [ NodeName ] + parent = "master" } +/* + * Defines a global zone containing templates, + * etc. synced to all nodes, if they accept + * configuration. All remote nodes need + * this zone configured too. + */ + +/* +object Zone "global-templates" { + 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.bla b/icinga2/zones.conf.bla new file mode 100644 index 0000000..0f2e353 --- /dev/null +++ b/icinga2/zones.conf.bla @@ -0,0 +1,31 @@ +/* + * Generated by Icinga 2 node setup commands + * on 2021-04-15 13:31:05 +0200 + */ + +object Endpoint "icinga.uhu-banane.de" { + host = "icinga.uhu-banane.de" + port = "5665" +} + +object Zone "master" { + endpoints = [ "icinga.uhu-banane.de" ] +} + +object Endpoint "sarah.uhu-banane.de" { +} + +object Zone "sarah.uhu-banane.de" { + endpoints = [ "sarah.uhu-banane.de" ] + parent = "master" +} + +object Zone "global-templates" { + global = true +} + +object Zone "director-global" { + global = true +} + + diff --git a/icinga2/zones.conf.orig b/icinga2/zones.conf.orig deleted file mode 100644 index 9c76de7..0000000 --- a/icinga2/zones.conf.orig +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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 containing templates, - * etc. synced to all nodes, if they accept - * configuration. All remote nodes need - * this zone configured too. - */ - -/* -object Zone "global-templates" { - 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/motd b/motd index ff600f3..d36efc9 100644 --- a/motd +++ b/motd @@ -6,9 +6,9 @@ Debian GNU/Linux 10 (buster) |____/ \__,_|_| \__,_|_| |_| -Versprechen, die im Freudenrausch gemacht wurden -verlieren zu Hause ihre Gültigkeit. - -- Al Bundy +Die Männer haben im Zorn mehr Mitleid, die Weiber vor- und nachher. +Habt ihr je eine Frau mitten im Zorne einhalten sehen? + -- Jean Paul Today is Setting Orange, the 32nd day of Discord in the YOLD 3187 -- 2.39.5