saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index d41556038ff28ab0d77a2f90898538a434659ac7..2ff6b9126f95d1494b72f63d8fe90b605ec25db5 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -6349,6 +6349,8 @@ maybe chmod 0644 'letsencrypt/csr/2673_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2674_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2675_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2676_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/2677_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/2678_csr-certbot.pem'
 maybe chmod 0700 'letsencrypt/keys'
 maybe chmod 0600 'letsencrypt/keys/0000_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0001_key-certbot.pem'
@@ -9027,6 +9029,8 @@ maybe chmod 0600 'letsencrypt/keys/2673_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2674_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2675_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2676_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/2677_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/2678_key-certbot.pem'
 maybe chmod 0755 'letsencrypt/live'
 maybe chmod 0755 'letsencrypt/live/ccu.hoellein.online'
 maybe chmod 0644 'letsencrypt/live/ccu.hoellein.online/README'

diff --git a/icinga2/features-available/api.conf b/icinga2/features-available/api.conf
index 6d479ba860476eaf9508e40e948d38746d38aade..8d85358a5ed2f54e0cb84013011a83eecfd6596f 100644 (file)
--- a/icinga2/features-available/api.conf
+++ b/icinga2/features-available/api.conf
@@ -1,7 +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
+  accept_config = true
 }
+

diff --git a/icinga2/icinga2.conf b/icinga2/icinga2.conf
index 1652417832a9fd11c9cc3e6465b5cc3eecdf07a6..63d69cadff316e28b9d413d0e669386ac80395a6 100644 (file)
--- a/icinga2/icinga2.conf
+++ b/icinga2/icinga2.conf
@@ -1,60 +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 = "home.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 2021-05-19 14:14:51 +0200
-// Disabled by the node setup CLI command on 2021-05-19 14:49:59 +0200
-// Disabled by the node setup CLI command on 2021-05-19 15:03:58 +0200
-// include_recursive "conf.d"

diff --git a/icinga2/zones.conf b/icinga2/zones.conf
index 81e6f97d1d2996f6984487b3d8088f14bb223805..05df41049d73abcbf0cc8eab7dbbd377886b11a8 100644 (file)
--- a/icinga2/zones.conf
+++ b/icinga2/zones.conf
@@ -1,31 +1,18 @@
-/*
- * Generated by Icinga 2 node setup commands
- * on 2021-05-19 15:03:54 +0200
- */
+/** Icinga 2 Config - proposed by Icinga Director */
 
-object Endpoint "icinga.hoellein.online" {
-       host = "icinga.hoellein.online"
-       port = "5665"
-}
-
-object Zone "mail.hoellein.online" {
-       endpoints = [ "icinga.hoellein.online" ]
-}
-
-object Endpoint "home.hoellein.online" {
-}
+object Endpoint "home.hoellein.online" {}
 
 object Zone "home.hoellein.online" {
-       endpoints = [ "home.hoellein.online" ]
-       parent = "mail.hoellein.online"
+  parent = "mail.hoellein.online"
+  endpoints = [ "home.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
 }
-
-

diff --git a/letsencrypt/csr/2677_csr-certbot.pem b/letsencrypt/csr/2677_csr-certbot.pem
new file mode 100644 (file)
index 0000000..366c5be
--- /dev/null
+++ b/letsencrypt/csr/2677_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM62
+cttZx4yl2WvC7+ISZkITZAhdxU6qg2jZtCHB2OGzKJFNiKU+YMYVTHEPUE7hfndU
+WAcUzLBAzfFYqfrChzZJ38UxYt0iTj2/Aby5JEEIsMsyHBqWFtiVJlChqKYYj/5x
+fgJgV7RfhmeurzH/Ozk4vvRl4k3oB64xsdbD0CNA5mstULVFsM+kiJ/E2hj3CvCr
+UDGPljdG3WitIn61h7kLuZnbLX3ej91OeLNFCn1VilfbZE7gH9zlCT/HAq5eBqTr
+ftWAYyCJaGGSdFEguJ60Kys40W1kouxk4zfOsZVtoSYWP9W0Wp+zNsPpOgAwpuot
+Ca3khix5duEtjZmRNpkCAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw
+FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQC4u5zcQr9r
+omT7oWjAET5jk99Lor0xp1WR9hDPct8z8153AANlRQ7w/i9ZGhJZ+lD7h1PVVscQ
+6rcsI7ZwoiUTHLcUtKZq6MAjY7EK9OClKSLDJlky4d70Cq3/+xAoPuN0ttCMnUjV
+WKU6TG4O/yGAifXW32tt1fZv90JGBfQDC7plaWUtV4MtdpwJ120n/lFEXc5608tN
+Ax9SjD7xjIn/wEhXbawKcIAmKcITp9h2wtjqFTf+ApeXliRenDZr21zaUb3V8QOm
+wwBgHZ3Jglg1OyJxyxdxpYCh8643zw6VsBricugMdUdXsi4qzWb9Vag/MkvRxAwO
+7wUzFe1EgDy2
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/csr/2678_csr-certbot.pem b/letsencrypt/csr/2678_csr-certbot.pem
new file mode 100644 (file)
index 0000000..38fd8ae
--- /dev/null
+++ b/letsencrypt/csr/2678_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPUw
+JzQ5j8rraxfhGZ7o/vvyhqAJj3gduUEyRhemZ0TP1NF3MW2hM1A3pXqYHQLS9sEN
+5kzQe3BfW4zGKFUveGjVeSUgCbbczr5w4WcK1oJaNPhQPH4rGZRkJ/JX+ywNQUaC
+7TYAPAEcE1Crumj6eyOhTNJHVTDBuRW8hMZex/igCGKXqfIPJXsAF6Fuc8gl/pdq
+BM36kosRfZFl40G95vv39ggKu7ppmOPiT4AY5Tg9AETGpuvCCObSYGNfWA+Q2bc1
+Wzxw6xNLabSAJ0+ysBUYCys2J31nYWwuyxX4cKgHRTnHT/93LMXuUIbIkXoF880F
+18man5hifn1Ic9JGDzcCAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw
+FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQCMZJZLbz1Q
+shGnfIi6ChUcghNLp8+mMsweLpBQ85+xKNV56OD1k/NOGu602Im8/65Mxi1zj+EB
+J09Hlm4xekenKt/2X6DNhGs75oDkN6xcJk1dNKUI486JLe9w3uNIn8Ggv8Bvfsbx
+sOzZsP0nSDr7UviQeo54aG+r/rKBYt3R5UEYDYdSPRcUxeFlzDwwrtKiqI9e6xR5
+kzpQA4lTjtQajGie1huXe3sCjvraclrZc+WAxpQCeKfzLjOxIYW2b5eDrXd/tCSf
+7cPj23Ba/Do+/1Gl27DXOIk5wTG/i1DgunpeWSHzWS98AELUm+Cyl8fuIvg8Yys/
+xN4Cx8IKMa3a
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/keys/2677_key-certbot.pem b/letsencrypt/keys/2677_key-certbot.pem
new file mode 100644 (file)
index 0000000..11d675e
--- /dev/null
+++ b/letsencrypt/keys/2677_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDOtnLbWceMpdlr
+wu/iEmZCE2QIXcVOqoNo2bQhwdjhsyiRTYilPmDGFUxxD1BO4X53VFgHFMywQM3x
+WKn6woc2Sd/FMWLdIk49vwG8uSRBCLDLMhwalhbYlSZQoaimGI/+cX4CYFe0X4Zn
+rq8x/zs5OL70ZeJN6AeuMbHWw9AjQOZrLVC1RbDPpIifxNoY9wrwq1Axj5Y3Rt1o
+rSJ+tYe5C7mZ2y193o/dTnizRQp9VYpX22RO4B/c5Qk/xwKuXgak637VgGMgiWhh
+knRRILietCsrONFtZKLsZOM3zrGVbaEmFj/VtFqfszbD6ToAMKbqLQmt5IYseXbh
+LY2ZkTaZAgMBAAECggEBAL9ci4ug22jLCDIIboX8vomg5dQQ6t1eYPSpxWYSzDJ0
+5rNM8Zj33CLECNYJdTDw82CIxk0X5j2sYHpyuDkZ6I5LaUpl474PShtDPdp2EqfZ
+4cDaDMZX96JcwPGYFkZdKsBEVIDiq46heA1321wPicX5UF10DEJO8P1Dp/zHnWFj
+wl8CjKUOHXqipTT3n/lmq2o+FN3XKb03935fko5NC7zgHQkK2w6gnkdKXTsorwVJ
+LNYjE1kYwv6oil/xzsZ3lnquQkVzRyUxg07kCf2/eN8i+dnsy2bwnnlwQXB22ZLH
+CtPiqVvAcfJWRkBIA54o27pOXX6AI4t9RyDL1AijOJkCgYEA92rLMgMWUKaB5Pql
+mPNpMzkH37fa+b8oKQ1F1mxc6tW72VRkxuJcQHNDCgE26WJHrtTTFolws72n/72F
+yljlNKjCccIv1YGvPkMnWD/en3OOmTIjHeJUkFqkmIQHgcyVvBsdYBfPbnlSvsWx
+HeTLq6DAMdkMW1VGTmi/MiADF5cCgYEA1eItBcbs1uvB2hZWZmamilovndPTlZ+d
+vDiJfzRmSt5iW6m2A6lGSZvIL/67sgnyf1WhZk2Osn+De3w2K5TMIq2y7vdKUphx
+tAmK9qhlcEqMnahHFvtyNph5WVuhZ5gHbOQ6/TNvTtvVVtvao4dJSxt5USGf9nga
+yIr8ECmQaU8CgYEA0GClWi23cZ2K8OsY5US8aWOy+fzC9GzGyixfkUQazb3NRDEL
+32VuBOoOoDJ9qPoZHWopjmWbAgbNo1pfgBh2km8/tMezucJLccjlLjI8sVaF1wif
+AuBIEHwG/FzWZb+ErLS5fOEQ1x5fTkT58w9radUtic4f1hxv5kHaJcFIWWkCgYAN
+oOvdgl91EnC3xNSckc3q4vRFykmhLxqN88xPHrel7aW20YmXkiG4bwTCiijLn3ak
+RoCSVD7TgOyP4cpR3JllXEwajgdeW/hi0HjaXsCX9ygeo6pj/IG6mNyipQQT5cwT
+VDeuCqj9DWT6s+eqo+Q3tPh2Av5+ZgjO3oxRO1TIYQKBgQCpF1vjlYAhzBCyxEZo
+JIX+46TFlvFm8wTw6EMrrdXgYMysCRtiWh55/KHUqYIP/6f2NxHPaWMiTbecjEbE
+MPDT6rKlAwCPWCAE7kl4hm4pFS+r1cSjmBPfVRktA7yT/hS1/frUrSCXpJQ5yXPP
+3LplGbEscQ2f0S2C6vMphdwv9Q==
+-----END PRIVATE KEY-----

diff --git a/letsencrypt/keys/2678_key-certbot.pem b/letsencrypt/keys/2678_key-certbot.pem
new file mode 100644 (file)
index 0000000..7db9aaa
--- /dev/null
+++ b/letsencrypt/keys/2678_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQD1MCc0OY/K62sX
+4Rme6P778oagCY94HblBMkYXpmdEz9TRdzFtoTNQN6V6mB0C0vbBDeZM0HtwX1uM
+xihVL3ho1XklIAm23M6+cOFnCtaCWjT4UDx+KxmUZCfyV/ssDUFGgu02ADwBHBNQ
+q7po+nsjoUzSR1UwwbkVvITGXsf4oAhil6nyDyV7ABehbnPIJf6XagTN+pKLEX2R
+ZeNBveb79/YICru6aZjj4k+AGOU4PQBExqbrwgjm0mBjX1gPkNm3NVs8cOsTS2m0
+gCdPsrAVGAsrNid9Z2FsLssV+HCoB0U5x0//dyzF7lCGyJF6BfPNBdfJmp+YYn59
+SHPSRg83AgMBAAECggEBAOgQXHrMpHFuIp2mW0aRxo0Wfh9JDTamA2pWuAq4X/O8
+NfTPuMPHmDarhH8lLAg5Pn14t2oqxTqVtqPmBdSiqnem3ROrYCZolXGgi2ao1mDo
+GkyQPME57+sIZNq2NS/7l7WyQ+whiqmONiXbdALaWORfTcOU6mfMY27UUGMk4GZK
+z4FFqhuFKROPaf1kiV42bKOpdVmixtNNxvwQtUJYi9//wbAcQFkZFp3Wi7D76eWS
+q67vblxdAqvFNkC/QUSngMYeBRCpAKTl9ob6Xx4Sgsprj6AfD8GNAliiUizcQ5Wo
+/t/24KJoQOyNg/9512zMqraJPxrqVFUhCwtH4QHr2eECgYEA+9ajGBJI966u9/t7
+zvUR1be/KYNwuIJhKm4SL6lvMp1u/J4TfSTScH7N9/kx0dyOxl7fdc+KvkccuiQI
+kBszQJ9fW8uYLKkDtCm2MQ+rcXWyUtcilB4XSDefCwHwKDaPX/dHd/qp8FkH96N1
+ADEakECEy+KHS2ymHzri67pRB5ECgYEA+T1iBNzXwPalhDbQr+HPKdOi8eUZEYff
+BY+/SAey318V4hFFP7nh5HzhOb5dQGUqm5JZdSq++EbWSET0MVtjJKC7lWeNWUGU
+i7fk+TDe+RGiUnw42idZsLVk/ouZ1wOn+VzwSdKJxvXq8liXJ0HHeyBKqTkUR/gf
+93QCQdJ+lkcCgYAvchmaAF/k4fEu4R9LN1qb1BlcvdmvuUiLEN+2QQqlE4oEZ9eu
+HRDUht9RF46uRgpUDy20aVxvSsB7xSwj0iwOwbfaeHn79/+toqojhhs7rfvhpYxr
+MVwbi/cXwM65FMZgQxsg3IXFtVBN9GqnlZi2kqEyNERfDmIhwhtcY+a+MQKBgQCF
+MKZGzvWFKsk8pEZVFyirw2saNUF2OtOVl0Gy7lpKP/fjvTLyYRU0EwAQ6YfPt8BT
+LpwbnuI6rzAnoqGUFrAejL5xksrYXdFR8M2t1M3y79d8mOGQwuKNKgJ0fImTe2Ky
+QVYvPRFff180bt8nnWFKjPEZCWWrKA99H0NthV0cVQKBgHobfZ05rzsz6ey/zsCL
+MH6gWJxq6qvdtJGa02IOU0T2pAZkzY8OftcRY4nchvyhqwEEI/O++fUjlyPom+k0
+IR5oNLdAc3/a2JRZmoRbhEbAWVlfVBNiPcUpXPRa7B+IMjC5Fg2Kp+AyZ3M9CYyZ
+78SktO4DoL0Wy9tmOROM/x4X
+-----END PRIVATE KEY-----