saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index dffebd13415ba162def88e9912266ea62b41e045..20c1860e5ce7927ee01a304d3325e0d0dd86e798 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -9,7 +9,6 @@ mkdir -p './ca-certificates/update.d'
 mkdir -p './dbus-1/session.d'
 mkdir -p './dpkg/dpkg.cfg.d'
 mkdir -p './fail2ban/fail2ban.d'
-mkdir -p './icinga2/pki'
 mkdir -p './initramfs-tools/hooks'
 mkdir -p './initramfs-tools/scripts/init-bottom'
 mkdir -p './initramfs-tools/scripts/init-premount'
@@ -768,8 +767,10 @@ 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 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'
@@ -790,12 +791,22 @@ maybe chmod 0644 'icinga2/init.conf'
 maybe chown 'nagios' 'icinga2/pki'
 maybe chgrp 'nagios' 'icinga2/pki'
 maybe chmod 0700 'icinga2/pki'
+maybe chmod 0644 'icinga2/pki/ca.crt'
+maybe chown 'nagios' 'icinga2/pki/ns3.uhu-banane.de.crt'
+maybe chgrp 'nagios' 'icinga2/pki/ns3.uhu-banane.de.crt'
+maybe chmod 0644 'icinga2/pki/ns3.uhu-banane.de.crt'
+maybe chmod 0644 'icinga2/pki/ns3.uhu-banane.de.crt.orig'
+maybe chown 'nagios' 'icinga2/pki/ns3.uhu-banane.de.key'
+maybe chgrp 'nagios' 'icinga2/pki/ns3.uhu-banane.de.key'
+maybe chmod 0600 'icinga2/pki/ns3.uhu-banane.de.key'
+maybe chmod 0600 'icinga2/pki/ns3.uhu-banane.de.key.orig'
 maybe chmod 0755 'icinga2/repository.d'
 maybe chmod 0644 'icinga2/repository.d/README'
 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/constants.conf b/icinga2/constants.conf
index 29232d618e56f5e33de9e462583c3802e9e8a62d..ab9cc82f7e78a2f36c07cd9facb269fe3dd21a85 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 = "ns3.uhu-banane.de"
 
 /* Our local zone name. */
-const ZoneName = NodeName
+const ZoneName = "ns3.uhu-banane.de"
 
 /* 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 0136de0b2289463a8a7f9572b3ef55af9e252134..be8acf381dc876f5f240dc71b66cce05a5aef81b 100644 (file)
--- a/icinga2/features-available/api.conf
+++ b/icinga2/features-available/api.conf
@@ -1,11 +1,13 @@
 /**
  * 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
new file mode 100644 (file)
index 0000000..0136de0
--- /dev/null
+++ b/icinga2/features-available/api.conf.orig
@@ -0,0 +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"
+
+  ticket_salt = TicketSalt
+}

diff --git a/icinga2/features-enabled/api.conf b/icinga2/features-enabled/api.conf
new file mode 120000 (symlink)
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/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/pki/ca.crt b/icinga2/pki/ca.crt
new file mode 100644 (file)
index 0000000..486532f
--- /dev/null
+++ b/icinga2/pki/ca.crt
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIEyjCCArKgAwIBAgIVAKijaxOh/7oUys2n+iw+GHS+hLDbMA0GCSqGSIb3DQEB
+CwUAMBQxEjAQBgNVBAMMCUljaW5nYSBDQTAeFw0xNzA5MjEyMDUxMjFaFw0zMjA5
+MTcyMDUxMjFaMBQxEjAQBgNVBAMMCUljaW5nYSBDQTCCAiIwDQYJKoZIhvcNAQEB
+BQADggIPADCCAgoCggIBALH5Dn55tfqcZejKiu+g/Bd+Nm3I6Maa7iAskg9C9HEM
+rg2FvJmJi+gSO25amjsZGTC+TnYxIwsWsIPYfDOsfrfkhb1uz5d+7jpJf9aEgVgW
+LZXXxL27rAEnACIHZDdQVLiz3SGSFiiXvYWEatfzfZk47IHLA4aYwnCwW9+QI5q1
+a+M+IfdQPR3CLHCYy4H5v9OUNv2qD3zkA50xO9QPt/DVtOx0n2CrmOjUOSC62sNE
+jEZ0QJM+rRT21Jf+EwcDJVu+QTGceu8/aQ2vjy24OGksPDufcLha5fkYmKghBFRV
+5jXr5NAoYhwMiZNPaLE+Rj8Sz+pHB83yVgBupHrD5sRbuz706mMftCDr3HNuDi/K
+NtNujYwbBTWufNYJE4u4tBnrmhZvJjOhhU6x0jRG1Sh75U/JICbgAAYvSZcNAU5/
+OxiUmgJsKk24M+6+lqnkBlhsPoK40U9zhGhO52ATVdfrrwV6PpPw+oepZm1HWfze
+E09lLC7GgBedbHuVS2xQ/C1L0vAZYfuiUyYMmpw33pX5EpAsDeu2kPWLKC3QjUJH
+GetmJZNypFUWFDkORRJZGq4hj3QeETJKGzU4++XzmMdAnUbDrg33zX+HwOTU1kJL
+W/hQCamzeai2whNSSnfConObXQ/zLqn9pE5ZrGTdQPIGerzzxSJm3PXu6zqxMVZt
+AgMBAAGjEzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAEtp
+xft6IvJgJNxHM1tIUAmbijmcu+Y4HGEZaAX4u18i7y/exXHTBbeqJ1dztLy/VSVa
+At94TcdZyewnHa0BsRNILI52qXlcoPBV57RzV+0jTfkK9L9FnuaDDaAYI8vHAxsL
+b0/wieQ3SCLtoJfVRGr3FObz0EtmedKGHpc7sPGYM88QY4iTYVKSFCvYvG4PpZAq
+K+EIn/sRcm6RdfnQwZ8dZ5zNeeZ1DmKlre0+pxwzXDgbTX+eC5CRqKKEknraYIX6
+F1GVEmNUXt5hN4je9Blqfp4e1mbArqXarJtxF5srqI7Dc877dXI//dokC5sivThK
+7pgpH9uaXv8QTUPEsQAAvra1thfPO3I8mrli/CrRThg6AoxMo2PeHu6nbkV4KGpj
+UXSg2gxR4+xoezuuSnnl0rBKLhrSFfEAyzR7hdSlBCgthLnpH7AMRxbosaYHziqQ
+DxZefpiF1vy2og+clbmrW0vyPdt6Bia2SDptWkdZWOG4vJzXqvGToaaaDpA4rrtY
+B3Xuhqyoa+Qq0NXBBpQUwPRceGrtehNgTGDokl6LExjI7h075TrWqTg3cc9LCmWf
+ShJpM5SpZxcGnHZTpZ5Sm4CatSPOy+GGGp64uCrr1vX3BVloQGeIphzupOJ7aIvr
+ZSAH/ibF9WkItQ5XGSgmCZyPL5KnI76jT7BQNi0m
+-----END CERTIFICATE-----

diff --git a/icinga2/pki/ns3.uhu-banane.de.crt b/icinga2/pki/ns3.uhu-banane.de.crt
new file mode 100644 (file)
index 0000000..6a20602
--- /dev/null
+++ b/icinga2/pki/ns3.uhu-banane.de.crt
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE7DCCAtSgAwIBAgIUaAN+D2Psv8SSjadwrN8/0yHMc5gwDQYJKoZIhvcNAQEL
+BQAwFDESMBAGA1UEAwwJSWNpbmdhIENBMB4XDTE3MTAxMDIxNDEzMFoXDTMyMTAw
+NjIxNDEzMFowHDEaMBgGA1UEAwwRbnMzLnVodS1iYW5hbmUuZGUwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQC+zpWWi1sUE3pLdNwnZP1r0VTpjL2OkTEg
+bZSuqVURMh8gdF/m8o7uyUotHsp5TGsu7mhU3tDSJaa5RXzaLRBsNKM8oFOh/TvO
+TP3jiDTbpZlWeumfRLTXaOwZZmgekxNFC9hZtNoVaOBOHtPcR+ODbP5WUfclbsdS
+g39MkbIyJlXw7mEFbjRndgsgAj6czYr/Qf1nDNTAtBbTpZDQwbxsXLly1pi1mW22
+MT52fb4eVktJSPzvPOmlVtJwvKMjjS+Qos9S5tBWqVtU7nGTUPKBf7KZeCiYFA+I
+wdY0vIjphfDPkchv/hQ7bjYo7jRJ177y30hlZGUA0vZ87EUeHBs4nutW7ma8lJNm
+NKYWzkOds5iUTAbgd7RX9hYqMlluOz9SJ+7ntp8gnPli/VO4K6RXTjtPB+t9PVjf
+YU7NHShkslJo4Ty8BcJ8vy7O7pZ/GOTuTE1YQVz0UHogNEEUYUXIMzRA1av8dUEk
+1xxsYUzoN/oV9067YxvIp2uQN91BFc5e/7cSB9VwWcCAIffQpqm5UbaUPoZrnuxa
+ZppyY/uaZyXsxmWQ8C2Zk52C4aSTgN91Nr1WREsaDWKK3U9s7bwnMZyg+3VjtTuO
+WIlimtg2J8JBBXzz7c5M+5ECaqLt2hM+R0VyrOJkto/nNZadJxg/KhpZGIgGiEV/
+BqSSJTVFhQIDAQABoy4wLDAMBgNVHRMBAf8EAjAAMBwGA1UdEQQVMBOCEW5zMy51
+aHUtYmFuYW5lLmRlMA0GCSqGSIb3DQEBCwUAA4ICAQAXEGnTPmiid+eQpqXX/nk1
+IH0GYjYfILzHYdO91GLHKn9PLdaaj3IljxIUTxN6E5sov4eUdA7XhNesjaYSN0gn
+g6fKXscTTkslBatZSTJMY4hwfTbbBXuuhREdIro83IgF3OJVQZC0UpskzS0gYGp1
+3ooAhsFpi7hSOdLcexXWrmJ9UApArmsmcwatyuq2Z5yoLuPizSRLm0LONWId1fCJ
+TK0+GnGlpoTprp2JsEI4g6KDYGDkWveykWvsrCIL+fOar8bc9MYh3aubpjetm6LJ
+nbZcchOUIo4Ss6QxJ4tUt7pm57ptADiPqqp9bcyPh8Ho0pggJ276GDznuln7AhgG
+c5Dyz0n4AOm9BHDiXdbHULk6GLi1nz6NwPkiNC/0y+RLbbPV/n9LqF9us9BZdCwc
+Loe31Y31ztIvf0ptidlf/PSrYJvow7CFEoTauqAUEOEu7u+z7vVEMLtBzBTa8NYO
+Xueemca5ENK/TumSP+FO/sK8u3HB7VRMs2xV+bimzPsZTeLSWnkSTvQdPOEfPPje
+lyz394Wm19U4SRbIyh0+Q+DEBjRsuOvcrLaChRoI8s9xvporhujnFrY9yoC9kpCa
+LhluoyJjUewQ9Ms2Lm/qT4Eb77Oa9iv5/Oj5Ns2irVCaX4Z+i/YvqEYhsaOq/+tc
+tZX3qY4vYdtAoA48ddriBw==
+-----END CERTIFICATE-----

diff --git a/icinga2/pki/ns3.uhu-banane.de.crt.orig b/icinga2/pki/ns3.uhu-banane.de.crt.orig
new file mode 100644 (file)
index 0000000..540785f
--- /dev/null
+++ b/icinga2/pki/ns3.uhu-banane.de.crt.orig
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE9TCCAt2gAwIBAgIVANdXUIXbfE/5yAi26cZZBajB/dJ9MA0GCSqGSIb3DQEB
+CwUAMBwxGjAYBgNVBAMMEW5zMy51aHUtYmFuYW5lLmRlMB4XDTE3MTAxMDIxMzYy
+MFoXDTMyMTAwNjIxMzYyMFowHDEaMBgGA1UEAwwRbnMzLnVodS1iYW5hbmUuZGUw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDLm04tvO2ccZkOmkHfqBX1
+QcWan8vYX3zwBb+QrDEli2vFzs7K1dbTS6cOWrQrqSJ0X0E4bwWd+5wG7bfLBOE7
+cN8JvGyKvKN1jvCOhrFzkhZAvmrjZ3WJTBpSm9tj2eD8sbATmYmgMpy4kVQysZyj
+KGqotbf9k/rHeGsw1UiFADP4owDp6Gk5D/VaOY2N1FT9hvOWsnwhPrCkggg+d+eG
+Rxm34TRQ19gWavx9v+YXmAh5ERFExTotXFhVuuMd2pJb+G7z8ph3kYELl8N9n8Sx
+VMajH8D4bwD61sNpEAnKKugT7PWtsy/qdEv6L2IygpV/bGqAC+cwewHg0QXE/tXQ
+OEvLta+1FrMovWNCg8J81oniOt7vUhmvlmscOO9NrI9EwTE/W4k6r5VmLK7QJ6DU
+KP4oDI/mdLxUc9ulxTMNYqRHnwjJQtTBdqtV0yrz1uVxkltUnfPy59wGOAZ+twyz
+khaTQPoNyef2VU1AfsMTML8BosvZagasAXQKBUCy716USzsqBo8ajTViihYkVKoP
+gDikxUHv2zY5Fo20nzgbBgUl4Z1QCDJ0Xag+m4jTpk025ZYiSMcMtB2kE4Rqxd1a
+V4/q0klgue/CMdc45WMGwR6x/E/Mr2OcvePpiOL9QNVzW+FhddhTg7bNz+dZufyk
+/DBMWSNqZJzwAm0+UhsNOQIDAQABoy4wLDAMBgNVHRMBAf8EAjAAMBwGA1UdEQQV
+MBOCEW5zMy51aHUtYmFuYW5lLmRlMA0GCSqGSIb3DQEBCwUAA4ICAQBtUyz7KofE
+tNRYJsMmoL37uNQu3EsyukFV8i6U013KAMWezG/TbcwO7K+L+n+WANgY5nwhcvUe
+Z0PihvbIAr3Zu8sbtIaNPOhLUqte3q1HfMtA5w55BywNwYXwwFxl64ZrUJxK71Pz
+QTXXvncmael9ouM5X5otbkwB2h3lAJyWPFKaXvhb+3MI3255+iPzsoNfGot01pro
+tuqMhz8KL9XAXSZKooRAUuReyF+ZkDfKOoezO+i5GON6zBqBXnEmCRYdpTAufLCA
+wjgcxanZPdtF74+bCOPnrc2fyolXDQJ4CA621xhNPlVw8PU00LlkQvIfHu9hTiL3
+thcfy17fW1Q3DcmYen1Go43/pvUQM7kS4AzpuSFLOP9xdRm0IoqnVd+UqzUP86b7
+joum9qQ6NuNlePBU8ZqCEOzmmnKBIWJA6uGWhma8PVQQq4BfNLQ36PgibSLhK3We
++Y0DygHxSoj4F6eUswdqzVw9pv+3GfZkP5gysuDz0sVyRmg+DEMAqnXXdzgoyaXt
+DOQ2u8pOFZr4/h/aseL7h7oxF+4gn4nMylmBN/4CcnauvWFa/cpDuHtfxhLFpJSF
+LprTa1wioScMZ7ZarCjnY6EEQ7Rc3IB/jVxUC0ZnnwXvyjxtXL633nKa+/BMsSmX
+kyBb6ca6/Wp3F6WgOEnoYDtUlxtmF3qjYg==
+-----END CERTIFICATE-----

diff --git a/icinga2/pki/ns3.uhu-banane.de.key b/icinga2/pki/ns3.uhu-banane.de.key
new file mode 100644 (file)
index 0000000..2e5f3de
--- /dev/null
+++ b/icinga2/pki/ns3.uhu-banane.de.key
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

diff --git a/icinga2/pki/ns3.uhu-banane.de.key.orig b/icinga2/pki/ns3.uhu-banane.de.key.orig
new file mode 100644 (file)
index 0000000..710debf
--- /dev/null
+++ b/icinga2/pki/ns3.uhu-banane.de.key.orig
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

diff --git a/icinga2/zones.conf b/icinga2/zones.conf
index 9c76de7bb02be63b8cf9cf2c5612acd415ef484d..a170131e81d6e160fc5a951e4fdbabbfdc409235 100644 (file)
--- a/icinga2/zones.conf
+++ b/icinga2/zones.conf
@@ -1,51 +1,23 @@
 /*
- * Endpoint and Zone configuration for a cluster setup
- * This local example requires `NodeName` defined in
- * constants.conf.
+ * Generated by Icinga 2 node setup commands
+ * on 2017-10-10 23:42:05 +0200
  */
 
-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
+object Endpoint "ns1.uhu-banane.de" {
+       host = "ns1.uhu-banane.de"
+       port = "5665"
 }
-*/
 
-/*
- * Read the documentation on how to configure
- * a cluster setup with multiple zones.
- */
-
-/*
-object Endpoint "master.example.org" {
-  host = "master.example.org"
+object Zone "master" {
+       endpoints = [ "ns1.uhu-banane.de" ]
 }
 
-object Endpoint "satellite.example.org" {
-  host = "satellite.example.org"
+object Endpoint NodeName {
 }
 
-object Zone "master" {
-  endpoints = [ "master.example.org" ]
+object Zone ZoneName {
+       endpoints = [ NodeName ]
+       parent = "master"
 }
 
-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 (file)
index 0000000..9c76de7
--- /dev/null
+++ b/icinga2/zones.conf.orig
@@ -0,0 +1,51 @@
+/*
+ * 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" ]
+}
+*/
+