From: mhoellein <mario@hoellein.online>
Date: Fri, 10 Jul 2020 23:19:33 +0000 (+0200)
Subject: daily autocommit
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=150db1a10ee4c96da83fa9590a469d8c9058bfc9;p=vserver

daily autocommit
---

diff --git a/.etckeeper b/.etckeeper
index f73c79c1f..07adcaf16 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -13,7 +13,8 @@ mkdir -p './dovecot/private'
 mkdir -p './dpkg/dpkg.cfg.d'
 mkdir -p './fail2ban/fail2ban.d'
 mkdir -p './gss/mech.d'
-mkdir -p './icinga2/pki'
+mkdir -p './icinga2/zones.d/global-templates'
+mkdir -p './icinga2/zones.d/icinga.hoellein.online'
 mkdir -p './initramfs-tools/conf.d'
 mkdir -p './initramfs-tools/hooks'
 mkdir -p './initramfs-tools/scripts/init-bottom'
@@ -1361,6 +1362,9 @@ maybe chmod 0640 'icinga2/icinga2.conf'
 maybe chown 'nagios' 'icinga2/pki'
 maybe chgrp 'nagios' 'icinga2/pki'
 maybe chmod 0700 'icinga2/pki'
+maybe chmod 0644 'icinga2/pki/ca.crt'
+maybe chmod 0644 'icinga2/pki/icinga.hoellein.online.crt'
+maybe chmod 0644 'icinga2/pki/icinga.hoellein.online.key'
 maybe chmod 0755 'icinga2/scripts'
 maybe chmod 0755 'icinga2/scripts/mail-host-notification.sh'
 maybe chmod 0755 'icinga2/scripts/mail-service-notification.sh'
@@ -1371,6 +1375,8 @@ maybe chown 'nagios' 'icinga2/zones.d'
 maybe chgrp 'nagios' 'icinga2/zones.d'
 maybe chmod 0750 'icinga2/zones.d'
 maybe chmod 0644 'icinga2/zones.d/README'
+maybe chmod 0755 'icinga2/zones.d/global-templates'
+maybe chmod 0755 'icinga2/zones.d/icinga.hoellein.online'
 maybe chgrp 'icingaweb2' 'icingaweb2'
 maybe chmod 2770 'icingaweb2'
 maybe chown 'www-data' 'icingaweb2/authentication.ini'
@@ -3828,6 +3834,7 @@ maybe chmod 0644 'letsencrypt/csr/2007_csr-certbot.pem'
 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 0700 'letsencrypt/keys'
 maybe chmod 0600 'letsencrypt/keys/0000_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0001_key-certbot.pem'
@@ -5840,6 +5847,7 @@ maybe chmod 0600 'letsencrypt/keys/2007_key-certbot.pem'
 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 0700 'letsencrypt/live'
 maybe chmod 0644 'letsencrypt/live/README'
 maybe chmod 0755 'letsencrypt/live/collabora.hoellein.online'
diff --git a/icinga2/pki/ca.crt b/icinga2/pki/ca.crt
new file mode 100644
index 000000000..a51b09105
--- /dev/null
+++ b/icinga2/pki/ca.crt
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIEyTCCArGgAwIBAgIUatpF57OIxtZKq/r4PPt0ET6AQfIwDQYJKoZIhvcNAQEL
+BQAwFDESMBAGA1UEAwwJSWNpbmdhIENBMB4XDTIwMDcwOTA5MjgyMVoXDTM1MDcw
+NjA5MjgyMVowFDESMBAGA1UEAwwJSWNpbmdhIENBMIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEAsAeZlVG8oIX5MUATgfPJk64t96p9K7JSxSw3vHxYRv/2
+JN7ouQuPtFmB45uUcKlzICUwedfC0zK0K/GSr6KX/oSXHYkQQRkJxWw8xupmSqBK
+CmZiONBNlKMgGuUU4+CvXHapZw1N9JhtzorWStuZLNNo7Td4q3WnaojHNhkMDSY3
+1OSBBZzAwySoQJ4qiUd+fPwJMaTmbXo2AlJcvrNX55uPHQP5Su/jdhJKML7A6Ti4
+426/Sn+1NMKgJO5JZdDnr6dm4AXZgz5H6dR5lv7ES7NypjxBe9Vrt6UGf5KeDW4F
+w6ADJCrpNFvDCfm5VMGPzzSiuJ9RJpGSqIj9aV7YnxijxhItCT0ze7HS8sbhZIH7
+pJezUA9fYZW8vIUH2HgCjfPcAcxUSXrqwSRa2ALEDV8uuvX2eFQsBpFYRR60zxj2
+seQJ6ri7AkwrG7QOzgiFSJDqP5psmut8vio66U4e5l2mta+DhalEGducGvsHj4St
+g0z9ACrx1Wa7FK2V9/JAnarMCVTgXhzpIov7axwwTzs2Dgbs4zvWV0X4XSw2bHgG
+psTQxMAIhI5AfNZ7Dyvc4G6Hev+Tp4BpC8HnIJNOo0hvT2kH4864KvYC1IFw8Af+
+tUCnPYIvgq4I7vpAqRaUs4fjDySXmYv4zlZpHuIIcjAY68hwHg4sdFWN5gc/v1cC
+AwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAcA/a
+VtmAn786QLrJLgoHUSY3cx4TBZAX4CQsuVpqvu3WPzrOxNeU7N13Wmfudv1RplLB
+SQ6VTk7yeCC/gvWQKdLOJWljHJyRka2WUuCRGM59AcsDrkKQJJ3ZOaafOfG88P1/
+1FaQ3lBsTureyLMlLPh2DI/al8hxs6jy7CDJ70YZ2sjT2vchMfCD1KFMNwVmLdDa
+yb0DeziGfTq2/g9/UHG9vUy+ehX0WUAAzzR4ltxw9OyuRypHyKUr2XOOm5B5Iv0d
+vZ5Gzo3Z8GKlDuJD0pox7xQqS+dGShk8euZRS5vpInMB4WoVmCdZglKBENP+uVAf
+5yjJjaK9mOPCwqi1MxZqYAoFM8wBH25Hoy0+y/WnSKPR3mtamEJI015V83BJYoT7
+B+8cuM2nWDBn4lCo3Cev8v3/aZdcs6IJFUhoDX1NJHX6fpztfu04IfveDdsnbjSx
+flx15nzekzisgErHYNlzc/LF5+IK5FWIjmuHJeT3oNe5KVn5GTpHIf0VhDCqsp0i
+IBI8530k1W2Gen9snY40KXWQdVcr4xQ3e/41oAAaqqKtsuEGGib31oRNZwX/okOG
+vngTxg/gtRtQauzH6BkjOqlxmdsNpTFFXc5nryGOLKg+YS0+iFuCjYeKdZ0AebcL
+QAIg26t+Z9o9aLE69mAfjyV6Nc6aOHHwNx6lQt0=
+-----END CERTIFICATE-----
diff --git a/icinga2/pki/icinga.hoellein.online.crt b/icinga2/pki/icinga.hoellein.online.crt
new file mode 100644
index 000000000..f72a6676a
--- /dev/null
+++ b/icinga2/pki/icinga.hoellein.online.crt
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE9zCCAt+gAwIBAgIVAP6ihywxfjbgFcv1C2JuMF1ZQbEjMA0GCSqGSIb3DQEB
+CwUAMBQxEjAQBgNVBAMMCUljaW5nYSBDQTAeFw0yMDA3MTAwNjQzMzZaFw0zNTA3
+MDcwNjQzMzZaMCExHzAdBgNVBAMMFmljaW5nYS5ob2VsbGVpbi5vbmxpbmUwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDbCet7lD6bOC2/PI5FI429LuHN
+8e00mTpaxvphxBEUGrqto7VCXZHP5gKdoQvMcAnTUeWpD3Brl4oR5I8aEsnSzcZI
+MRkiFPN/zaOaheP/NstXaFj2W+vMEaAjIGCi4loqEE+wqDfbT+5lJRtouHXK7DsS
+I96vOu35N6BS9vu1L128/B22dOfYFV/xFy+MwyiPbyegf5qFO9PD5qB48W2a5Z2f
+XvPOmOVkLeCK6ZF9zyRB9yvgNRaF8TeKHhLbfzyVSyiOOK8w1+ymU5/kGTe+PXTm
+a2w7sTXwAL90LbpiINio9vHG96BvFOuA5vZOgtLpwksdsCZ2JOGHumS/jOwYRNJ8
+INfj4qQyjXacq1FtgUwhgxVz/uAiVcN+Mijq1KHStagnR/cGemO8qkn8a5BQk9E4
+wwYGlio0SVMIyveKK55hPAXxc5B2UtxeSJ7aIGakWssw57rKs2FfxhA3cME/kOVh
+XVNYO7X0uairF6HvfEfPd/Q324Y1SRmFeGnyYBcYU5Cd+P79drd3x5BQu2KKW8Ln
+MS3IMsORUz5KNLNRsRoqV+bpQfSPjrt2+6LCTptJZtTbe9vU1Zcw1mU1MuUAurVf
+WJn7JNSpl7rpQVfqhC18Au67jD9ekMyMETXf7QsnFAiPssOc4FjLJrB14Txw5spD
+mGkhhADgIea9T6QRGwIDAQABozMwMTAMBgNVHRMBAf8EAjAAMCEGA1UdEQQaMBiC
+FmljaW5nYS5ob2VsbGVpbi5vbmxpbmUwDQYJKoZIhvcNAQELBQADggIBAG756j0f
+FCjFH3+Fn8SFHYHFJ9Y04E4q9B+EtV+gR5beGtn9C+PYzKnuAHcTYNDxrmQHQiMF
+noJ6i1NcAZR9tUEHsmAs/L6t08NYteohq6QSIPKzpYCgtQ4e9tzlxwnlDjnDOA/k
+0xA1KIHBH0rQfku8757Q+3ZA3mE7NNHSIdlUFLJd6zBFk7I6tFacLF9c1eAhRHWq
+YJfJ7PPyR2eGDyW5TaFr4ftoQtziRVxa/jFGA5EfMmA9I93FEdoCDp47jmU0TGgM
+hYG23Xu7JP91rwzbIRP57Ch1dg8R0NvkSxlXmQ9VMwTJv+aD7A1CbO5H6iiNL+fJ
+fnJ45Hdunh+CeNdzcZBOHYHn+ufrOkYdU6CX+5LXVqPRF4NJcAgA9S6IHK6FELsg
+i6FITxmTpUJsWAuOHGOWhE/dghOb7A2ncPVh+SrpE+c1j8bFS4DwGA3nJhA+iTD8
+LgfP6h+oVvpqq9C89wYDNdi7lP+JsoNHwkVmYQY1xhSEj4kzPGRIGOsjOZazUHkq
+FOm9bxxD4pQXb21Yjry4ngoBeyoCJVFx5oRK07Efi+CbAfamECWHIGjRWdNf/Pmp
+IBrBBNZsROuo+ArZqxp/fJvRKCAlMRIRc6HHk+XBqh870Le5Err5/An3D3zkdZIW
+lfwrZIbbyN1VzUsD9Nlo+Lzc8gjxN+28/cSU
+-----END CERTIFICATE-----
diff --git a/icinga2/pki/icinga.hoellein.online.key b/icinga2/pki/icinga.hoellein.online.key
new file mode 100644
index 000000000..f294842a5
--- /dev/null
+++ b/icinga2/pki/icinga.hoellein.online.key
@@ -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 70ac766d8..b148de032 100644
--- a/icinga2/zones.conf
+++ b/icinga2/zones.conf
@@ -42,22 +42,20 @@ object Zone "director-global" {
  * a cluster setup with multiple zones.
  */
 
-/*
-object Endpoint "master.example.org" {
-  host = "master.example.org"
+object Endpoint "icinga.hoellein.online" {
+  host = "icninga.hoellein.online"
 }
 
-object Endpoint "satellite.example.org" {
-  host = "satellite.example.org"
+object Endpoint "home.hoellein.online" {
+  host = "home.hoellein.online"
 }
 
-object Zone "master" {
-  endpoints = [ "master.example.org" ]
+object Zone "icinga.hoellein.online" {
+  endpoints = [ "icinga.hoellein.online" ]
 }
 
-object Zone "satellite" {
-  parent = "master"
-  endpoints = [ "satellite.example.org" ]
+object Zone "home.hoellein.online" {
+  parent = "icinga.hoellein.online"
+  endpoints = [ "home.hoellein.online" ]
 }
-*/
 
diff --git a/letsencrypt/csr/2011_csr-certbot.pem b/letsencrypt/csr/2011_csr-certbot.pem
new file mode 100644
index 000000000..3a5ba8b3e
--- /dev/null
+++ b/letsencrypt/csr/2011_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICcjCCAVoCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOL
+BhB9UVpMbz2kvdNJUHATCceLNbpEhigzm7z9OzmcEIINM60CpDmrgmTuSUN40+V4
+nkvmcbaKJ5nNFudOd6f6TZCZ+8bGiXbO7m8vbQuPtH0L5qgt6m1/yowqxktLlXNK
+wAMZex4B+D884xaUGLnVKMJT6eSG8qQCuqJorKExpKOYtTK+pEex7cc2qqTT9MIi
+DZAoM9+45EYRxyc1bWFYE9yy0n1/UAHe63il/MdwPRNqbrVLUQyKdaS1HresbUfM
+U/w0Bp/9Y78fmAhwJidpVwnXUU6kkbo2mgsbT1W4BVor/ffcQzwvpSkyEf6HBpXL
+TmtbzE3ty1EtU6AFVFkCAwEAAaAtMCsGCSqGSIb3DQEJDjEeMBwwGgYDVR0RBBMw
+EYIPaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQCmxDeIdibPDr1J
+RDq7cUR6mTuW14pTXmEBAl4YIAMxjtjGbiUfSaF2KI93cpzwb+p6evcLzpg0B5IO
+2L9kckRhZvN9FP9s01V0Y6nxZLD+MSqgpE2CtsMHZIVLO7lK1H6nAaG76QlWEZzi
+7SfxTYlTbGUePBIqCgVO2aSuIhdKHccM5n3+PFSqo34Kq0yC6Bet/9Vu8nX8YjPl
+NPh6adP6aZ380fGRzV1fo0b791TiWmnVtgk10eDReoGC1+o1lpwzi+5S0sP6dgBG
+evRGFfsRWlS2KETk/MAIczTMMoOfOf92vrLMqJBqajQx0AhuMqpftC4TE57Fv6Ye
+tsvG/wB9
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/keys/2011_key-certbot.pem b/letsencrypt/keys/2011_key-certbot.pem
new file mode 100644
index 000000000..4ce89031c
--- /dev/null
+++ b/letsencrypt/keys/2011_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDTiwYQfVFaTG89
+pL3TSVBwEwnHizW6RIYoM5u8/Ts5nBCCDTOtAqQ5q4Jk7klDeNPleJ5L5nG2iieZ
+zRbnTnen+k2QmfvGxol2zu5vL20Lj7R9C+aoLeptf8qMKsZLS5VzSsADGXseAfg/
+POMWlBi51SjCU+nkhvKkArqiaKyhMaSjmLUyvqRHse3HNqqk0/TCIg2QKDPfuORG
+EccnNW1hWBPcstJ9f1AB3ut4pfzHcD0Tam61S1EMinWktR63rG1HzFP8NAaf/WO/
+H5gIcCYnaVcJ11FOpJG6NpoLG09VuAVaK/333EM8L6UpMhH+hwaVy05rW8xN7ctR
+LVOgBVRZAgMBAAECggEAPWjhVM4cXLtNm7aESJ7C1BYiw6Oc8DrOO0NoFX/pvnqY
+rDhK5RGcPQWV79jguc6MrNPMGDqIjjYi8tn/qRw1TjUyaSTaW0TtSOkffHVnEXEh
+Mx/OUMorgKgVU4VjVR5W/0YW4Y93Fyn5N9pkDfzmBKRllawofOfT7lrAdT8vxgcN
+ER977us1uN7FG319+2+bl1/Ui8IxpOYZegww6IBiF6f4BghAOSJHD7Vma/EnU9Ey
+3KYzhiDfRNo1aeR8dPmoNNyxskLy9fTl5VHeoUeUejZGUVg9ajdabybO/OujPf9L
+jsoHOQVdGAG82cIvs/agbvIzmEhkB2mn7FqOHDEKJQKBgQDxdE5kcc4wmTSyx/cZ
+p6yZDgDfz2/ok4LpLt3vV/iIrwiPOUuoJdpZjrwgu/U6Jde0fv9rHcJsliWWOYW5
+fIh0gg274Vson1tVUaOUYb0BRTHp3X5oHCqD4Kbd4ADckhWDFPeT0cK6UAtI2Tf1
+O41TUDQ9jhru7J0uy3AySRQHgwKBgQDgSW2Ha33rXxef6dTvUPaNklzlvfAhiuRr
+SNwLGCpUXf6gBW0VJN5E4oSutCNf6ycQRZsCWXvgCgbP1das6xNukpKgPw/b2c0M
+2bNYjm+SSJfKgk9fthfDTAPHC2EQJnY0TiUkVqr+ELDUWLWdfjKL5FXPgIdGlOVZ
+atV3QmuR8wKBgQCGoiKgEXE2WgcvdR7MeFleUpecNG+jELWbTl3D+pqDpI2yRvFv
+xgOVkmhGHGglzzoS1AmZ8dMadzJoLJTrE4yG4onD7GnHIexsi4QZ1dHs5mdpju7Q
+IHx4YojJCQGR/Abwu309OGZLOxy/txdjr5wjC4LFm/papScUE63w7By1/wKBgF88
+TpnV9t3evvVUIOqNgmOS5odXI4Paqis0ANtlI3Q3hUsFgtAbm5W8aYKVUwADpc6u
+/6b7wDHdkA7oSgOaveGRs1j/7gf4b60pM5JCyPVghbOjqXiGpYhz2pbGKizlaAPF
+ute3RVwkUjGYiWWalHP6PMWjWc2Ko+hYCNRfC7YpAoGAHunEGyErQsmIIqfHxkAN
+r4O+Jp4t3E0XeoJM6f7VPKQZK9o8hGy790+N5yLFylozvzPK+El1cJH95R/IE9VF
+NUEcmDWGAR+jAyKkIKBK2TNcsqxyetzvo0WucsItRAAlb7vvY/g11vlIxryXUYI8
+4g3HAyJOHZX4UcqDyAUcHtM=
+-----END PRIVATE KEY-----
diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem
index 7ddf81fe2..e61b2e249 100644
--- a/myssl/dh2048.pem
+++ b/myssl/dh2048.pem
@@ -1,8 +1,8 @@
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEAgqJZlDR7VzbYPgmPRw1lWcI4eRDOR1ZPqoCkuXq99GEGM4lX5y5+
-x6ET3PrbadBARSpWKfzAIbI7r762tggR8gTcXx1D94XqO7YWxdejZmJE9cw58S8p
-pJu297/lI5+vJaTKWBHkril9jpRcaS0kqFPgUTD/Q1MJ6AvHLeiTvi/oM4vHm+rQ
-rJiaoGx2HYDAGrBV+GgQBuf8+2B/yZhvWo2tPDmAg4IL7SkPil+LzAeMQDe97/zo
-utsLf+/CixHRwBUerbKibxrX6VJSoTev3NrgNpcpw62fF/KWQeMUdmYX7TtXmBKm
-3urQXiGQgEbaVLrni+WAvFjMfKLYOtSdiwIBAg==
+MIIBCAKCAQEA1KscJtgBAKkGWtZwDOpQaxDB90QsxyJxgWBixh4rf9BVkmfza/ls
+DpOyAC74tD6NZpDyamMH3piDHo6baDMn2+SZhU5uR8YqAQWJCS+xESrvkzrqOYiK
+UP7uId3Z4IJe306mSErMVO6DT9pHZGVWKD+CpVYe9uufyqGETdV3wTaw+eTMx25T
+9jar42l5IIC3vnZWtB0ShRq+CP8QxfERI1jY433fnRKQDAEPerxT+68VHRKRIYCb
+gHat4GWNEuqC2bzH7oT1cYMoBbPI+hQ8l4EK+HALhRmknfpsYbz5EmmY1LGRn/Bb
+b5pppgM3xLPE9AxJx363NBoW5UFNJhDJawIBAg==
 -----END DH PARAMETERS-----