From: mhoellein <mario@hoellein.online>
Date: Sat, 11 Jul 2020 17:46:52 +0000 (+0200)
Subject: saving uncommitted changes in /etc prior to apt run
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=46b4e04ea01fefb41b76f5e4dad122beae1d3d45;p=vserver

saving uncommitted changes in /etc prior to apt run
---

diff --git a/.etckeeper b/.etckeeper
index 07adcaf16..7e30a95c2 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -3835,6 +3835,7 @@ maybe chmod 0644 'letsencrypt/csr/2008_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2009_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2010_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2011_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/2012_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'
@@ -5848,6 +5849,7 @@ maybe chmod 0600 'letsencrypt/keys/2008_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2009_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2010_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2011_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/2012_key-certbot.pem'
 maybe chmod 0700 'letsencrypt/live'
 maybe chmod 0644 'letsencrypt/live/README'
 maybe chmod 0755 'letsencrypt/live/collabora.hoellein.online'
diff --git a/icinga2/features-available/graphite.conf b/icinga2/features-available/graphite.conf
index e02e89527..72ff4ad81 100644
--- a/icinga2/features-available/graphite.conf
+++ b/icinga2/features-available/graphite.conf
@@ -2,6 +2,7 @@
  * The GraphiteWriter type writes check result metrics and
  * performance data to a graphite tcp socket.
  */
+library "perfdata"
 
 object GraphiteWriter "graphite" {
   host = "icinga.hoellein.online" 
diff --git a/icingaweb2/modules/graphite/config.ini b/icingaweb2/modules/graphite/config.ini
index fe391dd4a..9e9bb7980 100644
--- a/icingaweb2/modules/graphite/config.ini
+++ b/icingaweb2/modules/graphite/config.ini
@@ -1,5 +1,5 @@
 [graphite]
-url = "http://icinga.hoellein.online:2003"
+url = "https://icinga.hoellein.online:2003"
 user = "admin"
 password = "LgnhywREd4INdvhsQdqYAsuicEju0Yxi"
 insecure = "0"
diff --git a/letsencrypt/csr/2012_csr-certbot.pem b/letsencrypt/csr/2012_csr-certbot.pem
new file mode 100644
index 000000000..82b1d749d
--- /dev/null
+++ b/letsencrypt/csr/2012_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICcjCCAVoCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALnn
+d6xUrUrp6sbmUnHMuFzh6+dHdVfjHU/D9I1XH1VYQCwd3ZQ5MLs50AHvM9Sx3cQf
+S3TMWkCkMX/1x3d7HxHJqT+hbif9B/ou0u2Bc5ZmQd5FFRqd+CwsNeweqDbHlWmp
+hgVQDD3ecT2I8Jwa2eLfTJNpDUaZWFh2cOqwALJHyiPya1DdFILruyEmYjViwyYc
+ORIV9C+hbbB1lKUtjFr4ROs0N1AEk46VtJ5AWMQg0sVkk5TLz7YdyFlFHMr01QRW
+Hte5z4QEW45J/f/M+KDL+kpJogihfHA0UmF7GknlgFKH9200+iwXeLLeNJKxTes8
+IqPqPy5bH3mcFrxU+hkCAwEAAaAtMCsGCSqGSIb3DQEJDjEeMBwwGgYDVR0RBBMw
+EYIPaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQCSLitf2CRlhURq
+PLltpiWj3PrPQioDJGTiccqhqZ4zxRtX7YRqZ5T0QW7m/ToJKgXUOam94nHWZ8AV
+zeL6Yzi/NsNhnkDjjstUCecOQVplLzoRjFCzm5IVYvyBf+eSPEca6dNqUVfTOcJn
+soA93MyuVjLnfJQZjPnHkBKdkdDtm4NB3+q308n9vnVL1NtHo4Hi36fNwSOunsZV
++X4uKEdgU8EhISEt7to5oJPcQtR0mwK5OdDb1cVMDftqzYDqMfhyQuZUIvrWg6UE
+NvxZ23LX87dXGTdeoVy6eZZ7ooJ+6QRFnXtt6wCFWyiWjxBiIQHxURiEKv++zXgN
+NKsIQ5XX
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/keys/2012_key-certbot.pem b/letsencrypt/keys/2012_key-certbot.pem
new file mode 100644
index 000000000..a22b6112a
--- /dev/null
+++ b/letsencrypt/keys/2012_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC553esVK1K6erG
+5lJxzLhc4evnR3VX4x1Pw/SNVx9VWEAsHd2UOTC7OdAB7zPUsd3EH0t0zFpApDF/
+9cd3ex8Ryak/oW4n/Qf6LtLtgXOWZkHeRRUanfgsLDXsHqg2x5VpqYYFUAw93nE9
+iPCcGtni30yTaQ1GmVhYdnDqsACyR8oj8mtQ3RSC67shJmI1YsMmHDkSFfQvoW2w
+dZSlLYxa+ETrNDdQBJOOlbSeQFjEINLFZJOUy8+2HchZRRzK9NUEVh7Xuc+EBFuO
+Sf3/zPigy/pKSaIIoXxwNFJhexpJ5YBSh/dtNPosF3iy3jSSsU3rPCKj6j8uWx95
+nBa8VPoZAgMBAAECggEAH6PHeGsI+2EIdkWo7nlbP2OsFLbSv9yFlpfRPWUAjjPw
+6BFFLv70zkiuoEWn2qFTDxgMbZqCGdJYImEgS7OGvC5IQe4lo2SrQOdLOuT3WTea
+KkwzpU4ReOMlYkRteLVLNqqFhs3y52y+dSyjVs4zGyvKCqSsf8GFibjOywKde7n1
+buTEpHF2qzMKXGBDomklnTD/x34WZ2I55iFAa/C2BDxKFazD1mYKeKD7t8LXu1Gm
+UfxW/l+3dF02ylEUnHSAqzijc/9RRDGUWQ2O2nBH91TZQ6OCLJqd9l6xDocnfM4u
+4XAkqdmghcxVICDByN1M5W4KPoDZnIs5gKMQHRRRAQKBgQD0WO7yjKxCJSmp1ZkX
+CoRwpXV9VQSlqUHFmMo2rOOcUvUxrWY2DvL7ZgR69AF2n2LNAlQo+ywgXIZAjhRv
+Spno8aV1X6xB56pEIcV4Tq3Jhj4U2B7NQ9r9tnAPLWxN/ahkq8oJKci/aPZlTAow
+oigmP6Ivr1oOauKX2n/JxQ7vCQKBgQDCxQqkquVU/Y1tV/osw6k2T3muL5kisykM
+eUc9iP6Q8eE8yMdn9T11HobvYI8KlIeizcpM4nSKTfaRlO+ctixxVdDeyx6N2frg
+avWJgHwU/nFsQFhTOnO4IJ6uZ4KQiIRDu7ItYUDAQsPq82KjL2XQtrA4Kg+RcuRm
+e51ctRJmkQKBgBZJznH9dvEJpsVBIJfDc9U6on7uNGBQEhnOGBPorVJjFs6TPJGN
+x4g7BAmbHE8PttlwbvDWCG5jQjO9QgvsyCFBeZA9S98vHI7ebb7NnniVcDBCjny2
+xdECxTH9OLXcf3G/Ycx4LUGYd3FCAGPzRqpGf6rN2e8avNSRL7rd6MDRAoGAcOuk
+XAvoofnOwRI8rS9TL3WsalyWQBP3PJAjyX1fedGCcKdHVPJOC1UDjk1BITUz3iPJ
+ogG452aECat7sDO+WIcUbdb9g+hZFztr16hySAms4MH9c2N0K9Bdr2e7vugnJs3v
+Y3f6/ny28cTh7xJPyU3hpO5d0En4OaJ5fYJNhMECgYB6yaKMGA7BHW8kF5fGwfRd
+mX7Jn2IIUEqF3cpm2LcOfIPSPyfFWwdO3tAyeQ6QN2injf5kHUL6K4H7cOwIyBZZ
+W4iDQvO/DRAYW97WAY+SqrYDCIdd4h0sbi9Tvu5Fp3Sgi9OMZ1dYN0l/DiWp2ulb
+TgxGWmX3HRtMDAmaUbxvkw==
+-----END PRIVATE KEY-----