saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index dcea7930337a533fc9b1a7294c9e6b9317be1cd5..068d19d357d4d6140f66d46d68b90d2b3d299ede 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -12,7 +12,6 @@ mkdir -p './console'
 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/conf.d'
 mkdir -p './initramfs-tools/hooks'
 mkdir -p './initramfs-tools/scripts/init-bottom'
@@ -739,6 +738,7 @@ maybe chmod 0644 'icinga2-classicui/cgi.cfg'
 maybe chgrp 'www-data' 'icinga2-classicui/htpasswd.users'
 maybe chmod 0640 'icinga2-classicui/htpasswd.users'
 maybe chmod 0755 'icinga2/conf.d'
+maybe chmod 0644 'icinga2/conf.d/api-users.conf'
 maybe chmod 0644 'icinga2/conf.d/app.conf'
 maybe chmod 0644 'icinga2/conf.d/apt.conf'
 maybe chmod 0644 'icinga2/conf.d/commands.conf'
@@ -774,6 +774,18 @@ maybe chmod 0644 'icinga2/init.conf'
 maybe chown 'nagios' 'icinga2/pki'
 maybe chgrp 'nagios' 'icinga2/pki'
 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 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 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 0755 'icinga2/repository.d'
 maybe chmod 0644 'icinga2/repository.d/README'
 maybe chmod 0755 'icinga2/scripts'

diff --git a/icinga2/conf.d/api-users.conf b/icinga2/conf.d/api-users.conf
new file mode 100644 (file)
index 0000000..e13c74a
--- /dev/null
+++ b/icinga2/conf.d/api-users.conf
@@ -0,0 +1,9 @@
+/**
+ * The APIUser objects are used for authentication against the API.
+ */
+object ApiUser "root" {
+  password = "8f0fd5e6f1a374d9"
+  // client_cn = ""
+
+  permissions = [ "*" ]
+}

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/pki/ca.crt b/icinga2/pki/ca.crt
new file mode 100644 (file)
index 0000000..ad85dcb
--- /dev/null
+++ b/icinga2/pki/ca.crt
@@ -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
new file mode 100644 (file)
index 0000000..278d781
--- /dev/null
+++ b/icinga2/pki/ns2.uhu-banane.de.crt
@@ -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.csr b/icinga2/pki/ns2.uhu-banane.de.csr
new file mode 100644 (file)
index 0000000..01559d0
--- /dev/null
+++ b/icinga2/pki/ns2.uhu-banane.de.csr
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIEkDCCAngCAQAwHDEaMBgGA1UEAwwRbnMyLnVodS1iYW5hbmUuZGUwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDPl+TcFXII/xWKXBoaHGRu5qDJ/qHL
+MOLVI3AX+TrcR7mX3EizXiMENfDQwTneCH3bb7HDdZciTVUXh5NDYxC0PH/AibhH
+MI5gOZ7ZIV+20U6DEmNpFCuyjqdigRWLCw7IHYU6MPVSQdYqyrfDVJbrD3giI74Y
+Een2JVUb+c8PqHqXxPgGH+bQCjE3jewDVL93vetMgkhb++9jbiqrTXVT/tjO2A6+
+mPPMEfEyBIAS4ouR90sil6/uKE+FfGq2q2gMTCSjW3uzYMWVTKbiSL7y/lxAVTcn
+IDQPqF8XIU7y8BZ1na4EkZrVUbD6A93/00R3QoCqn3eFGOmIcRny9Xs6U7eS1pxv
+x/EsevoXMzKIM4hg+5hs2brUe7nMisAHdFhTSlFhY0wOrd4zIa0t2VpicxCZbTBE
+3V5n83GOdilPTQTpADvKh6Ky5Jzk+J4VHMgI/3EyLbQazvyTIV9gM/hCP9ioMzs3
+XqGc4TI+HmLSSH35XVlJQXcFHPWqLC2lN9EN3ES3ghnK/5ini46Xw30Hz/TAXWb9
+V208CxzTS/VNciHBAW3e4LbAbHLSqmBn4Ih3VXup4NfEUMRkcKvrNwoVwjclHUs1
+8LA2dmRdYKyFe1Ycmy44sMguBaCyXl4jOGVdQHZ/dnVoEGJL3T7MiKulI4WMlYQt
+Sg/YkUb78B316QIDAQABoC8wLQYJKoZIhvcNAQkOMSAwHjAcBgNVHREEFTATghFu
+czIudWh1LWJhbmFuZS5kZTANBgkqhkiG9w0BAQsFAAOCAgEAQrcocxooeqzdPPpD
+gDglM3N8BltvRpvmuzJgIx3lw8T309LZryIgMWuxcq7M3rWP8JN5tcW0ZapSzxYb
+WIwn07rcxDQD7JI4AhT3+XbztUMC4TGj1Fm2bwXdvze1i89WxfeuuI+3t1pFd/4+
+uMauhMrjNjeiPY2ZtiOTLgLkXW4F4Nocak74dokwqvaxwwro0LXah+Pkc+VXkHox
+OZU9b/2lX7yWRZ10syNfh/H3dINajgURMhMPBNm75EFBFewCpYgW6DRQkXz1HJfX
+ehF5iRHZ1lJtZwTxWtfL0wQeomnc0XEnLCzV4FFx4x/I0FPzto/lDzunJvETgIv4
+9jEAqSfsN4tsOa/QDubH4IvowjOCAv+6wj5QSi+aRN8c0jdfPm701ug9bBWxsH5/
+Y30Z5XgQsfjKadTyn+hxA2GGOqEa+tMGTuI/4KdevC72fkRcz3Pa4bhC5E/8n0vj
+ZA9Qj7urCkaMHvGlwBpQhniqwGoZwubRXsPUvTXZzFqkI2czfBmk/zUMIlXPHFs8
+NB21ojiYobswBjhvT5O5TJe6ddCls3GUED+v3qFsNjLTRkP1+hMvoESdBWzWe9xM
+QSj34jpvdRSs2cJsIeDjcW8lfY61Us/nHbbVkWqyQNKeupjhi+b+aQAUi3eR0dGU
+c8zIJboCcniE+dqZmV29HsLj6nM=
+-----END CERTIFICATE REQUEST-----

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