daily autocommit

diff --git a/.etckeeper b/.etckeeper
index a5fb85bd76185cac8d54bc34952c87db22b9c4e6..47aeb1ba7a83a22f9adc658c908f2c05f10d8bc7 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -752,8 +752,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'
@@ -777,21 +779,25 @@ maybe chmod 0700 'icinga2/pki'
 maybe chown 'nagios' 'icinga2/pki/ca.crt'
 maybe chgrp 'nagios' 'icinga2/pki/ca.crt'
 maybe chmod 0644 'icinga2/pki/ca.crt'
+maybe chmod 0644 'icinga2/pki/ca.crt.orig'
 maybe chown 'nagios' 'icinga2/pki/ns2.uhu-banane.de.crt'
 maybe chgrp 'nagios' 'icinga2/pki/ns2.uhu-banane.de.crt'
 maybe chmod 0644 'icinga2/pki/ns2.uhu-banane.de.crt'
+maybe chmod 0644 'icinga2/pki/ns2.uhu-banane.de.crt.orig'
 maybe chown 'nagios' 'icinga2/pki/ns2.uhu-banane.de.csr'
 maybe chgrp 'nagios' 'icinga2/pki/ns2.uhu-banane.de.csr'
 maybe chmod 0644 'icinga2/pki/ns2.uhu-banane.de.csr'
 maybe chown 'nagios' 'icinga2/pki/ns2.uhu-banane.de.key'
 maybe chgrp 'nagios' 'icinga2/pki/ns2.uhu-banane.de.key'
 maybe chmod 0600 'icinga2/pki/ns2.uhu-banane.de.key'
+maybe chmod 0600 'icinga2/pki/ns2.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..11139d8bda982e12f62c244d964dfb0baa1e51a9 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 = "ns2.uhu-banane.de"
 
 /* Our local zone name. */
-const ZoneName = NodeName
+const ZoneName = "ns2.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..11139d8
--- /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 = "ns2.uhu-banane.de"
+
+/* Our local zone name. */
+const ZoneName = "ns2.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 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/command.conf b/icinga2/features-enabled/command.conf
deleted file mode 120000 (symlink)
index 42924bc..0000000
--- a/icinga2/features-enabled/command.conf
+++ /dev/null
@@ -1 +0,0 @@
-../features-available/command.conf
\ No newline at end of file

diff --git a/icinga2/features-enabled/compatlog.conf b/icinga2/features-enabled/compatlog.conf
deleted file mode 120000 (symlink)
index 6feca25..0000000
--- a/icinga2/features-enabled/compatlog.conf
+++ /dev/null
@@ -1 +0,0 @@
-../features-available/compatlog.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/features-enabled/statusdata.conf b/icinga2/features-enabled/statusdata.conf
deleted file mode 120000 (symlink)
index efacf70..0000000
--- a/icinga2/features-enabled/statusdata.conf
+++ /dev/null
@@ -1 +0,0 @@
-../features-available/statusdata.conf
\ No newline at end of file

diff --git a/icinga2/icinga2.conf b/icinga2/icinga2.conf
index a809b96949804586f2311e23277ee802a9d3b532..019072f98f5eb23367a54f349be31a1711b97b76 100644 (file)
--- a/icinga2/icinga2.conf
+++ b/icinga2/icinga2.conf
@@ -60,4 +60,4 @@ 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"
+#include_recursive "conf.d"

diff --git a/icinga2/pki/ca.crt b/icinga2/pki/ca.crt
index ad85dcbc0697f331bc3014132b715d5cc4ccb2aa..486532f7e770ae128472e8c89fed1517dc1365aa 100644 (file)
--- a/icinga2/pki/ca.crt
+++ b/icinga2/pki/ca.crt
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-MIIEyTCCArGgAwIBAgIUOhlcKLHR6sCx6bMjTVcUnw8KUbIwDQYJKoZIhvcNAQEL
-BQAwFDESMBAGA1UEAwwJSWNpbmdhIENBMB4XDTE3MDkyMTIwNTE0NloXDTMyMDkx
-NzIwNTE0NlowFDESMBAGA1UEAwwJSWNpbmdhIENBMIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEA2d5iLRPzyX13Vq/rZLpgKlRmhw0ttgfb8uuLk5Y+2V/j
-iysU7xr9kGvruV6x+hB1jEGdSYY51wsCeugdfhGFqg3HCk145Dc5CgwU2PLl3VUw
-P99oAKv0wwaxiDfKEx8oVXfZDEBsSUsW7a2OvL/IgBMVFG0r3Wh2+c6AQj/jjett
-qsQrNawCxG3UK8DZyXEl6Ne0UGA7ZOTNgobrA/6tiKmRPjvTK5lU8bYQUODudIy4
-Ybe9T9JFGrOIEKEosG7M0cDwJC3gUlv0OIWoV3PUSC4U3pHbTMZo61/K8E7R+3Gi
-yYio2oGSdOazyXYtuhJlL5569YbUfm6NgxPo+9RcgHTF1WjfkYq/tFH9PNdnviYo
-fT1IrA0gAIlt0h1fM0kGnOEFycHEFcKHKqQmrGqYEzZLgXhXZM3tm1TIU/c/keE5
-pWkV9TY22C1I/8APr26CTSjbdW90bf2+BZkJ4yJkc1NMdOCHalmyOC35hSU2tBpZ
-JUqJeoTG0kR30137odHjKkon7l6ZztXrdZU00bjoPqYfNznCy4i5yvL2N3RiK2Tf
-KYlINnRmzW2r7yUhxK9Q4NaEGZXY0KpF20H581YNjt3k5TW1Bcxvl9cCmNKpHaVn
-Y+Uqno7q7Wb/HPtLZBt2KCj/M2WONBO3QGm2ovOTO8U2JQXaOgD5USIFJxsbkX8C
-AwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAsstJ
-qQi5YK3/gfbwsVqN3+S1zV14OPF/+3r9L/hq34N/9XC7zKm817X8s8Qh9pofKqVR
-Uuz1oPSrwUHBq61cWTdpKu91fXjWQK8hKUCCl9Jk5EL2dBRjDaI2qg1kYcS4ir2l
-Z8OnbQ9yXHj1KZhUOaARp7qw0wzW7ASG94tNkgUscyQ7R6F7qNudOLwwwSShM6A4
-l+3nM5Ykn1U4csld/j7yZNmxj7NSWxpszAtIcJLMSpJ8UpFSNK4wzJZlDTpiy6uA
-VcZpg1lNzWvsFnIRkaGmKC0F7REZMFQBYlm5amUtatlXoRC+fw/N/kH/zcL9CT0+
-fDzWekGB+6givtlEEDIG1gGrbXTOpuqYzw5DpN7UuUD+EK2n7JehJUwPaZ8R1Yl+
-yfFjvC5QCaB6cqlkVjUpbEZpvusrCK6axjpEMoHQ+LoW6RNfQdNZ54PTycdK7c9l
-EdqN3lzOjhqF9sUytX3po1eyH4r1oq+TUQ0vS10MEHyHzMq/rp0VY/R+lrZKCWgb
-FxHjiRO92tnphpErn7YkyQI8Qq64gMQx0oqvaIzQMeoxghivAVM0t4g7SYoY8qYj
-1Xt/fkADcATJ+A8WkMiHH2Tqm5xDyC/NNmmdw5alNW+aOeKG0917eDKLotCx5r9Q
-2IbeorPDT0ayVE2UYFTjxpx7g0vTBa6UEw5wRtk=
+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/ca.crt.orig b/icinga2/pki/ca.crt.orig
new file mode 100644 (file)
index 0000000..ad85dcb
--- /dev/null
+++ b/icinga2/pki/ca.crt.orig
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIEyTCCArGgAwIBAgIUOhlcKLHR6sCx6bMjTVcUnw8KUbIwDQYJKoZIhvcNAQEL
+BQAwFDESMBAGA1UEAwwJSWNpbmdhIENBMB4XDTE3MDkyMTIwNTE0NloXDTMyMDkx
+NzIwNTE0NlowFDESMBAGA1UEAwwJSWNpbmdhIENBMIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEA2d5iLRPzyX13Vq/rZLpgKlRmhw0ttgfb8uuLk5Y+2V/j
+iysU7xr9kGvruV6x+hB1jEGdSYY51wsCeugdfhGFqg3HCk145Dc5CgwU2PLl3VUw
+P99oAKv0wwaxiDfKEx8oVXfZDEBsSUsW7a2OvL/IgBMVFG0r3Wh2+c6AQj/jjett
+qsQrNawCxG3UK8DZyXEl6Ne0UGA7ZOTNgobrA/6tiKmRPjvTK5lU8bYQUODudIy4
+Ybe9T9JFGrOIEKEosG7M0cDwJC3gUlv0OIWoV3PUSC4U3pHbTMZo61/K8E7R+3Gi
+yYio2oGSdOazyXYtuhJlL5569YbUfm6NgxPo+9RcgHTF1WjfkYq/tFH9PNdnviYo
+fT1IrA0gAIlt0h1fM0kGnOEFycHEFcKHKqQmrGqYEzZLgXhXZM3tm1TIU/c/keE5
+pWkV9TY22C1I/8APr26CTSjbdW90bf2+BZkJ4yJkc1NMdOCHalmyOC35hSU2tBpZ
+JUqJeoTG0kR30137odHjKkon7l6ZztXrdZU00bjoPqYfNznCy4i5yvL2N3RiK2Tf
+KYlINnRmzW2r7yUhxK9Q4NaEGZXY0KpF20H581YNjt3k5TW1Bcxvl9cCmNKpHaVn
+Y+Uqno7q7Wb/HPtLZBt2KCj/M2WONBO3QGm2ovOTO8U2JQXaOgD5USIFJxsbkX8C
+AwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAsstJ
+qQi5YK3/gfbwsVqN3+S1zV14OPF/+3r9L/hq34N/9XC7zKm817X8s8Qh9pofKqVR
+Uuz1oPSrwUHBq61cWTdpKu91fXjWQK8hKUCCl9Jk5EL2dBRjDaI2qg1kYcS4ir2l
+Z8OnbQ9yXHj1KZhUOaARp7qw0wzW7ASG94tNkgUscyQ7R6F7qNudOLwwwSShM6A4
+l+3nM5Ykn1U4csld/j7yZNmxj7NSWxpszAtIcJLMSpJ8UpFSNK4wzJZlDTpiy6uA
+VcZpg1lNzWvsFnIRkaGmKC0F7REZMFQBYlm5amUtatlXoRC+fw/N/kH/zcL9CT0+
+fDzWekGB+6givtlEEDIG1gGrbXTOpuqYzw5DpN7UuUD+EK2n7JehJUwPaZ8R1Yl+
+yfFjvC5QCaB6cqlkVjUpbEZpvusrCK6axjpEMoHQ+LoW6RNfQdNZ54PTycdK7c9l
+EdqN3lzOjhqF9sUytX3po1eyH4r1oq+TUQ0vS10MEHyHzMq/rp0VY/R+lrZKCWgb
+FxHjiRO92tnphpErn7YkyQI8Qq64gMQx0oqvaIzQMeoxghivAVM0t4g7SYoY8qYj
+1Xt/fkADcATJ+A8WkMiHH2Tqm5xDyC/NNmmdw5alNW+aOeKG0917eDKLotCx5r9Q
+2IbeorPDT0ayVE2UYFTjxpx7g0vTBa6UEw5wRtk=
+-----END CERTIFICATE-----

diff --git a/icinga2/pki/ns2.uhu-banane.de.crt b/icinga2/pki/ns2.uhu-banane.de.crt
index 278d781d4f98c20a339031f22cd9afa85a867cd4..aeb833ed869f03db3ef9a71614d5d2342e005a03 100644 (file)
--- a/icinga2/pki/ns2.uhu-banane.de.crt
+++ b/icinga2/pki/ns2.uhu-banane.de.crt
@@ -1,29 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIIE7TCCAtWgAwIBAgIVANZQWdQmmGPvDzTUz/6qJgrdlCaWMA0GCSqGSIb3DQEB
-CwUAMBQxEjAQBgNVBAMMCUljaW5nYSBDQTAeFw0xNzA5MjEyMDUxNDZaFw0zMjA5
-MTcyMDUxNDZaMBwxGjAYBgNVBAMMEW5zMi51aHUtYmFuYW5lLmRlMIICIjANBgkq
-hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAz5fk3BVyCP8VilwaGhxkbuagyf6hyzDi
-1SNwF/k63Ee5l9xIs14jBDXw0ME53gh922+xw3WXIk1VF4eTQ2MQtDx/wIm4RzCO
-YDme2SFfttFOgxJjaRQrso6nYoEViwsOyB2FOjD1UkHWKsq3w1SW6w94IiO+GBHp
-9iVVG/nPD6h6l8T4Bh/m0AoxN43sA1S/d73rTIJIW/vvY24qq011U/7YztgOvpjz
-zBHxMgSAEuKLkfdLIpev7ihPhXxqtqtoDEwko1t7s2DFlUym4ki+8v5cQFU3JyA0
-D6hfFyFO8vAWdZ2uBJGa1VGw+gPd/9NEd0KAqp93hRjpiHEZ8vV7OlO3ktacb8fx
-LHr6FzMyiDOIYPuYbNm61Hu5zIrAB3RYU0pRYWNMDq3eMyGtLdlaYnMQmW0wRN1e
-Z/NxjnYpT00E6QA7yoeisuSc5PieFRzICP9xMi20Gs78kyFfYDP4Qj/YqDM7N16h
-nOEyPh5i0kh9+V1ZSUF3BRz1qiwtpTfRDdxEt4IZyv+Yp4uOl8N9B8/0wF1m/Vdt
-PAsc00v1TXIhwQFt3uC2wGxy0qpgZ+CId1V7qeDXxFDEZHCr6zcKFcI3JR1LNfCw
-NnZkXWCshXtWHJsuOLDILgWgsl5eIzhlXUB2f3Z1aBBiS90+zIirpSOFjJWELUoP
-2JFG+/Ad9ekCAwEAAaMuMCwwDAYDVR0TAQH/BAIwADAcBgNVHREEFTATghFuczIu
-dWh1LWJhbmFuZS5kZTANBgkqhkiG9w0BAQsFAAOCAgEABbl+W1jgyy8WJQyqwZhS
-lyh499Y8grahp5lIP7kEkZal3acVJqAoG9koftB0pgL9eGtbmxKq7Swz/eIiIYmW
-dNZZQwcx5b59n6HHiq/5+CVfWsLh+Nc2H+UXtY1uCmTLuuRYXQF5eEuuMKqO2Iyp
-sBxuXn+OFGHqeCerNBGLtTXh/pKZMdelD5Iqch6BJWZg99MBEAM4FDi8vPvQYyVr
-iibTq91Nstt/7Jb1M+UmHbKzFhdyyRNFLg1Gp688YSR1eU1fTTax0O5XJyxoNdIB
-SLvczPAvntLa1bsZY6PjGxLrHbzAEfXjOYFYezu49bp+NL2MDpeIzqE79bPFgEov
-9GCCqwmzYK+HyrN+NmZ+yy/xiAGJjEjoNPrmB2fl/W4OBn1AYHrzb2pCzsijwQCC
-wATEFfYEG/TBr+M/Gd7lTSqEjDysGfK49IJEP+eIqnbY1hPjgYLAhS8FvwDhck1+
-LngT1lJuI1j9ThfaxXDH884QWIdVhzukmiJuWDm0qowCCntvIKj2RYTSURB4x5Nm
-EExbG6CKQ0aYXqCWzBzbcyF6p4VGylAy5n/FUUItUDR8guDDGM8dx/hUqRfQh3SH
-VnaoY5Ad4/Z9ibrWBI6lWFjaV6XkCpkfWZ4J+Iar1iZi3YnvDUVpOV09f4esHwQU
-m8grGAGNHRRoygTME2xfY80=
+MIIE7DCCAtSgAwIBAgIUKyy+I6MiN+EQnqTug0YQTvrqaF0wDQYJKoZIhvcNAQEL
+BQAwFDESMBAGA1UEAwwJSWNpbmdhIENBMB4XDTE3MTAxMzEzMjgxOVoXDTMyMTAw
+OTEzMjgxOVowHDEaMBgGA1UEAwwRbnMyLnVodS1iYW5hbmUuZGUwggIiMA0GCSqG
+SIb3DQEBAQUAA4ICDwAwggIKAoICAQCfln8+4OiCscCfjoeQ5YuUQrgpSEaj6FR7
+VsyGvfceszJF9rygiUCYlWMeLMWhEpL1zwTMZ8Qe+OhEbiVHnftXuBi/bZhdSY7K
+thXaoIPQqVaDtahWaTMu1dO9DecGl+t7MlK1aZp5UUeHocZ0m0QArELMptAgJgry
+arHN/thTHQlHfNLT4eyaZQ1j4t9+KFMd47v3Q5iW/BLblHsvAxN6zKRtlo+zIfIY
+ByS/EOHY5O/rytHxvsbY3s9lcploqEXUVtDpmT4rg1h3AYGefzzIAMIYtvE55Vhu
+SLSVdwTyyU5FgqTmbQYir9ZmRC60Fj5Oe85ZROC5jsrDyxW9aAcROmzq/pIkVCWC
+A2EJK15R376xCxFZoFgSOlqrRp4/Wk2z6rB8ew1KSPG6nWSMi2ZV7nWma3nC2NLv
+MYxvm07POx/Rr/3xZ53zmInYvHZCXt081y/qDrS+cfEjfin15Aux5SeSJeFHdfDA
+JzYeP7R/JLHWnK406PKPoDFLG3Htfc/fNO8OyRFyhlTDxHdS+H8rV6mQNmAlOUOG
+OmUpgKRuiovOtaQEWRSFunC1kzmmwLgJaKt1sJyfOG46IEp3ntfxczTirf//66pw
+hQOunv/bakPEzVbix4y6E/yYfK+g+VmuI76GIf2gGgqpLx5UZoPcPK91PzqkjsTX
+Xyv7GTitewIDAQABoy4wLDAMBgNVHRMBAf8EAjAAMBwGA1UdEQQVMBOCEW5zMi51
+aHUtYmFuYW5lLmRlMA0GCSqGSIb3DQEBCwUAA4ICAQCWxUXSRh4aH7Vkdwvw3QEl
+Z88sdVFJcTkIMXuw19cyGFeucbMqvM1p33DU2MeMreWYt9qs4n88lQyXzRYpuX/X
+kHYL+vIoTD1mBRa3FN0Uy8iimY0layptmnWQkl+oG1h1lwsQ07Qe3AoklhclPxQG
+tqIMVN6VrQjpXUjW3VxAhMpDafZjG954wotCmb0Nysjndk5a+AGoZbEhCbVtdOKm
+6wIqhTRdpPXvLvqaLnujc1T3nY2fqT05s+zubzlseL8geRrmgqrqIM5V2/GFrGbS
+ZI4XiutcDgJSd4+7DJ2bacN0r69JKnRPF6hQkJZm78sczQ/dNsupUVSIHPkMuIYh
+YhNADwZKkh5NugsPRzLcqIyKa5WPxNmXWFFbh/tPARdSBdsUbVEUU0KlSOh2lKtW
+ZNkjdLk5ZTsm9WjDY/KDdRnGkeWYCdplIRI2vKZlqNnzbknMC7Zy5+Nb4Mh62NB/
+klUy01jOma3Vdi/8RFbH2/FR5VEdNJnFDJ4buW7iaPOC2KJeTWd+GOR7EYKgkUuy
+zbn4hQpX0JdWCWE7ve/+R08b3xOMQN1snKZWhrbe/6wKOpnIbYCFHyZqzUKYCVei
+grd1OiQGpq0Uq8XjZICLPY2O4ZqAU0IpjYF3FK1DJ922C/NGx9PAh6sM7UktWP1u
+G9WtsEGOo1LiP2D13S0wNQ==
 -----END CERTIFICATE-----

diff --git a/icinga2/pki/ns2.uhu-banane.de.crt.orig b/icinga2/pki/ns2.uhu-banane.de.crt.orig
new file mode 100644 (file)
index 0000000..278d781
--- /dev/null
+++ b/icinga2/pki/ns2.uhu-banane.de.crt.orig
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE7TCCAtWgAwIBAgIVANZQWdQmmGPvDzTUz/6qJgrdlCaWMA0GCSqGSIb3DQEB
+CwUAMBQxEjAQBgNVBAMMCUljaW5nYSBDQTAeFw0xNzA5MjEyMDUxNDZaFw0zMjA5
+MTcyMDUxNDZaMBwxGjAYBgNVBAMMEW5zMi51aHUtYmFuYW5lLmRlMIICIjANBgkq
+hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAz5fk3BVyCP8VilwaGhxkbuagyf6hyzDi
+1SNwF/k63Ee5l9xIs14jBDXw0ME53gh922+xw3WXIk1VF4eTQ2MQtDx/wIm4RzCO
+YDme2SFfttFOgxJjaRQrso6nYoEViwsOyB2FOjD1UkHWKsq3w1SW6w94IiO+GBHp
+9iVVG/nPD6h6l8T4Bh/m0AoxN43sA1S/d73rTIJIW/vvY24qq011U/7YztgOvpjz
+zBHxMgSAEuKLkfdLIpev7ihPhXxqtqtoDEwko1t7s2DFlUym4ki+8v5cQFU3JyA0
+D6hfFyFO8vAWdZ2uBJGa1VGw+gPd/9NEd0KAqp93hRjpiHEZ8vV7OlO3ktacb8fx
+LHr6FzMyiDOIYPuYbNm61Hu5zIrAB3RYU0pRYWNMDq3eMyGtLdlaYnMQmW0wRN1e
+Z/NxjnYpT00E6QA7yoeisuSc5PieFRzICP9xMi20Gs78kyFfYDP4Qj/YqDM7N16h
+nOEyPh5i0kh9+V1ZSUF3BRz1qiwtpTfRDdxEt4IZyv+Yp4uOl8N9B8/0wF1m/Vdt
+PAsc00v1TXIhwQFt3uC2wGxy0qpgZ+CId1V7qeDXxFDEZHCr6zcKFcI3JR1LNfCw
+NnZkXWCshXtWHJsuOLDILgWgsl5eIzhlXUB2f3Z1aBBiS90+zIirpSOFjJWELUoP
+2JFG+/Ad9ekCAwEAAaMuMCwwDAYDVR0TAQH/BAIwADAcBgNVHREEFTATghFuczIu
+dWh1LWJhbmFuZS5kZTANBgkqhkiG9w0BAQsFAAOCAgEABbl+W1jgyy8WJQyqwZhS
+lyh499Y8grahp5lIP7kEkZal3acVJqAoG9koftB0pgL9eGtbmxKq7Swz/eIiIYmW
+dNZZQwcx5b59n6HHiq/5+CVfWsLh+Nc2H+UXtY1uCmTLuuRYXQF5eEuuMKqO2Iyp
+sBxuXn+OFGHqeCerNBGLtTXh/pKZMdelD5Iqch6BJWZg99MBEAM4FDi8vPvQYyVr
+iibTq91Nstt/7Jb1M+UmHbKzFhdyyRNFLg1Gp688YSR1eU1fTTax0O5XJyxoNdIB
+SLvczPAvntLa1bsZY6PjGxLrHbzAEfXjOYFYezu49bp+NL2MDpeIzqE79bPFgEov
+9GCCqwmzYK+HyrN+NmZ+yy/xiAGJjEjoNPrmB2fl/W4OBn1AYHrzb2pCzsijwQCC
+wATEFfYEG/TBr+M/Gd7lTSqEjDysGfK49IJEP+eIqnbY1hPjgYLAhS8FvwDhck1+
+LngT1lJuI1j9ThfaxXDH884QWIdVhzukmiJuWDm0qowCCntvIKj2RYTSURB4x5Nm
+EExbG6CKQ0aYXqCWzBzbcyF6p4VGylAy5n/FUUItUDR8guDDGM8dx/hUqRfQh3SH
+VnaoY5Ad4/Z9ibrWBI6lWFjaV6XkCpkfWZ4J+Iar1iZi3YnvDUVpOV09f4esHwQU
+m8grGAGNHRRoygTME2xfY80=
+-----END CERTIFICATE-----

diff --git a/icinga2/pki/ns2.uhu-banane.de.key b/icinga2/pki/ns2.uhu-banane.de.key
index b9d655615f8519955164b6dd58275703e7e5a698..94d610ce34a2b003f6e7269716ff8766107c7efd 100644 (file)
--- a/icinga2/pki/ns2.uhu-banane.de.key
+++ b/icinga2/pki/ns2.uhu-banane.de.key
@@ -1,51 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

diff --git a/icinga2/pki/ns2.uhu-banane.de.key.orig b/icinga2/pki/ns2.uhu-banane.de.key.orig
new file mode 100644 (file)
index 0000000..b9d6556
--- /dev/null
+++ b/icinga2/pki/ns2.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 70ac766d86606fc44eaab37ef0157b9b0f6a1b75..44b9f15326c08141a9b087bf743fdaa59fd50be5 100644 (file)
--- a/icinga2/zones.conf
+++ b/icinga2/zones.conf
@@ -1,63 +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-13 15:28:40 +0200
  */
 
-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
+object Endpoint "ns1.uhu-banane.de" {
+       host = "ns1.uhu-banane.de"
+       port = "5665"
 }
 
-/*
- * 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 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..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" ]
+}
+*/
+

diff --git a/iptables/rules.v4 b/iptables/rules.v4
index 8d7386cddd03fbfeb92cfe2e4e85bf91abee567c..aa16e6eed722720d356c636c4ea6c59c487366fb 100644 (file)
--- a/iptables/rules.v4
+++ b/iptables/rules.v4
@@ -1,9 +1,26 @@
-# Generated by iptables-save v1.6.0 on Thu Jul 20 11:01:12 2017
+# Generated by iptables-save v1.6.0 on Fri Oct 13 16:05:26 2017
 *filter
 :INPUT ACCEPT [0:0]
 :FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [52:6001]
+:OUTPUT ACCEPT [150:44051]
+:f2b-apache - [0:0]
+:f2b-apache-modsecurity - [0:0]
+:f2b-apache-nohome - [0:0]
+:f2b-apache-noscript - [0:0]
+:f2b-apache-overflows - [0:0]
+:f2b-postfix - [0:0]
+:f2b-ssh - [0:0]
+:f2b-sshd - [0:0]
+:icinga2 - [0:0]
 :rejects - [0:0]
+-A INPUT -p tcp -m multiport --dports 22 -j f2b-ssh
+-A INPUT -p tcp -m multiport --dports 25,465,587 -j f2b-postfix
+-A INPUT -p tcp -m multiport --dports 0:65535 -j f2b-sshd
+-A INPUT -p tcp -m multiport --dports 80,443 -j f2b-apache-nohome
+-A INPUT -p tcp -m multiport --dports 80,443 -j f2b-apache-modsecurity
+-A INPUT -p tcp -m multiport --dports 80,443 -j f2b-apache-overflows
+-A INPUT -p tcp -m multiport --dports 80,443 -j f2b-apache-noscript
+-A INPUT -p tcp -m multiport --dports 80,443 -j f2b-apache
 -A INPUT -s 220.192.0.0/12 -p tcp -m multiport --dports 22 -j REJECT --reject-with icmp-port-unreachable
 -A INPUT -s 222.184.0.0/13 -p tcp -m multiport --dports 22 -j REJECT --reject-with icmp-port-unreachable
 -A INPUT -m conntrack --ctstate ESTABLISHED -j ACCEPT
@@ -15,9 +32,24 @@
 -A INPUT -p tcp -m tcp --dport 53 -j ACCEPT
 -A INPUT -p tcp -m tcp --dport 22 -j ACCEPT
 -A INPUT -p tcp -m multiport --dports 80,443 -j ACCEPT
+-A INPUT -p tcp -m tcp --dport 5665 -j icinga2
 -A INPUT -j rejects
 -A INPUT -j NFLOG --nflog-prefix  "INPUT Reject " --nflog-threshold 1
 -A INPUT -j REJECT --reject-with icmp-port-unreachable
+-A f2b-apache -j RETURN
+-A f2b-apache-modsecurity -j RETURN
+-A f2b-apache-nohome -j RETURN
+-A f2b-apache-noscript -j RETURN
+-A f2b-apache-overflows -j RETURN
+-A f2b-postfix -j RETURN
+-A f2b-ssh -s 58.218.198.142/32 -j REJECT --reject-with icmp-port-unreachable
+-A f2b-ssh -j RETURN
+-A f2b-sshd -j RETURN
+-A icinga2 -s 185.102.95.107/32 -j ACCEPT
+-A icinga2 -s 162.254.24.33/32 -j ACCEPT
+-A icinga2 -s 185.48.118.128/32 -j ACCEPT
+-A icinga2 -s 185.48.118.130/32 -j ACCEPT
+-A icinga2 -j REJECT --reject-with icmp-port-unreachable
 -A rejects -s 134.119.179.226/32 -j REJECT --reject-with icmp-port-unreachable
 -A rejects -p tcp -m tcp --dport 23 -j REJECT --reject-with icmp-port-unreachable
 -A rejects -p udp -m udp --dport 137 -j REJECT --reject-with icmp-port-unreachable
@@ -31,4 +63,4 @@
 -A rejects -p tcp -m tcp --dport 5060 -j REJECT --reject-with icmp-port-unreachable
 -A rejects -p tcp -m tcp --dport 8080 -j REJECT --reject-with icmp-port-unreachable
 COMMIT
-# Completed on Thu Jul 20 11:01:12 2017
+# Completed on Fri Oct 13 16:05:26 2017

diff --git a/iptables/rules.v6 b/iptables/rules.v6
index 09ed4ab72c8a427824ff6d11913c4857e913c9e0..ec8ebe20704c0f00006181d20ee74b283d2da213 100644 (file)
--- a/iptables/rules.v6
+++ b/iptables/rules.v6
@@ -1,7 +1,7 @@
-# Generated by ip6tables-save v1.6.0 on Thu Jul 20 11:01:12 2017
+# Generated by ip6tables-save v1.6.0 on Fri Oct 13 16:05:26 2017
 *filter
-:INPUT ACCEPT [1:49]
+:INPUT ACCEPT [38464:4000036]
 :FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [57:3185]
+:OUTPUT ACCEPT [38537:4004124]
 COMMIT
-# Completed on Thu Jul 20 11:01:12 2017
+# Completed on Fri Oct 13 16:05:26 2017