daily autocommit

diff --git a/.etckeeper b/.etckeeper
index e3907d876633bfc7c4a6cc5816f0b35db1edfb27..16b645b893e7fd3a530e96889f43d898a18ca58b 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -5641,6 +5641,8 @@ maybe chmod 0644 'letsencrypt/csr/2105_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2106_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2107_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2108_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/2109_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/2110_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'
@@ -7751,6 +7753,8 @@ maybe chmod 0600 'letsencrypt/keys/2105_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2106_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2107_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2108_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/2109_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/2110_key-certbot.pem'
 maybe chmod 0755 'letsencrypt/live'
 maybe chmod 0755 'letsencrypt/live/ccu.hoellein.online'
 maybe chmod 0644 'letsencrypt/live/ccu.hoellein.online/README'

diff --git a/icinga2/conf.d/apt.conf b/icinga2/conf.d/apt.conf
index 02e4c48c94b23a2802580c629cfc2bc7497081af..5ea2665052994c0e547472e97230eca30f657ff7 100644 (file)
--- a/icinga2/conf.d/apt.conf
+++ b/icinga2/conf.d/apt.conf
@@ -1,5 +1,5 @@
 apply Service "apt" {
-  import "generic-service"
+  import "daily-service-check"
 
   check_command = "apt"
   vars.apt_only_critical = "true"

diff --git a/icinga2/conf.d/templates.conf b/icinga2/conf.d/templates.conf
index 5655e3f2d4b7c3dadbdadbada85bc8c7d8957946..1fa2e38a306f09e6fe30d347b38d83c87a153c31 100644 (file)
--- a/icinga2/conf.d/templates.conf
+++ b/icinga2/conf.d/templates.conf
@@ -29,6 +29,18 @@ template Service "generic-service" {
   retry_interval = 30s
 }
 
+template Service "weekly-service-check" {
+  max_check_attempts = 5
+  check_interval = 168h
+  retry_interval = 24h
+}
+
+template Service "daily-service-check" {
+  max_check_attempts = 5
+  check_interval = 24h
+  retry_interval = 12h
+}
+
 /**
  * Provides default settings for users. By convention
  * all users should inherit from this template.

diff --git a/letsencrypt/csr/2109_csr-certbot.pem b/letsencrypt/csr/2109_csr-certbot.pem
new file mode 100644 (file)
index 0000000..87f8518
--- /dev/null
+++ b/letsencrypt/csr/2109_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMmA
+cFcs90LfvVY/defSG3LJcxxQ1zuZUPpS5JCTLKMkt/a1Gzk/Fs9yVMzOFWdBR569
+ayytrvUsNIAJ/H412SxFUx7ZaYiHla2BLsHZuj2yanc/59ZGe7O62RbztDTbJi/r
+yoi7LH2bEMwrbwSON+BRppJ2WuI3FzdYOGaOEqIhA/GBrlOCryztOvGxIDWyR/Kx
+M9h1I0cYVS1ZOMkRiqB88S7LlZBVJLMWqql/U90dREWjapcgBWoEx/clbB0NJhc5
+1lVeGtJfnn/OLnFK1qp5KSVYj7D+IeZL3jmp+7bTZI18sMxYDNVKPdSu7FxzpW2/
+qgSffSUnlwcabMhe0QkCAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw
+FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQBi7do1olk1
+WYkJHSYzLafj9c1bDklLUIYPJXtO+Wlx8gUqZoeZ3tnIcPZCzAOlLjAGMC533kq+
+qwEF0lKbujv1260fTW6dFnkKsc0dtNDVJsie09Wm1ZQbKAkz7BxEKyzVn0F7B6ze
+SnxBcjps/jx+e/YhQpjvwZLqiIP9GUrOLKyFob+hV5D/OGzI/hUL0tPxTZPtKghB
+o0zMKRmpg+EouE4gfmQQhoTbye9BiiwKZS9pYyBWXQC9ahZF/ChQkgEAyE/sCo6U
+LUNcqTtHHB5uqtSneCv5lQ2z6KOgWsY9QpWO/tU5JPPDvcE9OsuI2K2b3rzHCSgN
+pLdhOuAM9Cuv
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/csr/2110_csr-certbot.pem b/letsencrypt/csr/2110_csr-certbot.pem
new file mode 100644 (file)
index 0000000..b4acb59
--- /dev/null
+++ b/letsencrypt/csr/2110_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN13
+otFnBLhwEFzpdrRnDxRFezdl3wp8oxYGvwNnNnv9Hqdikv1qmh7z2a2iNHl9b37N
+j6SML60iF10fLclkjA98Fp3Qw01JK8z1mrU624EeXb7inh9C/XLm3fzqgzXiE9dH
+EsBNsD2Id30dV2yQSc0vpjlnmLMFVnyz5MIxHyEXq2YBpxsVXSO/x2bvofpA/GaV
+ZrwYja2XjD0VgUATNCdSW4ZgRJhnHYAs7PFyiQx5ycHb1mG73vFwIXahX0Lgkmg6
+iuXtkTMGHelCccosAJ0RvEPKcylCYq7zCioxPBEAHOflTRXDiIVd3ASEXR/msDNV
+dGbwLHH/dpq/IIALDXsCAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw
+FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQCq9xRVo/t3
+bEjwOHy1sBDn+omhfLtCc9DFDNLMPDiY5H2QzD3culDKCYBNKwUNDhoa/hSl8VSG
+LzmIAUuq531GaCTgOmTHdpf2n0s83qphpJ+qZpQY8yyOPNijd8EESkIDD8QOe/LX
+bldn3vw/ZTat9gWMmKJbOq42rngfQoeZAwxUDXStfoxHrw3HZaGF5+Sh/1gKH/Un
+s8LAipuWe8Jzz0Hc+EqRDm0sAzzIqk/2yKIC6+RvKpv84beNPxU2YlGLK/QIJdv2
+iRHsUln8B88cgoplHSZLc9wFrx65/oH7s99Is4c7RwU7e0x0l0qpUyHBC88Z82F+
+xzrwvucpYeKL
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/keys/2109_key-certbot.pem b/letsencrypt/keys/2109_key-certbot.pem
new file mode 100644 (file)
index 0000000..2962266
--- /dev/null
+++ b/letsencrypt/keys/2109_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDJgHBXLPdC371W
+P3Xn0htyyXMcUNc7mVD6UuSQkyyjJLf2tRs5PxbPclTMzhVnQUeevWssra71LDSA
+Cfx+NdksRVMe2WmIh5WtgS7B2bo9smp3P+fWRnuzutkW87Q02yYv68qIuyx9mxDM
+K28EjjfgUaaSdlriNxc3WDhmjhKiIQPxga5Tgq8s7TrxsSA1skfysTPYdSNHGFUt
+WTjJEYqgfPEuy5WQVSSzFqqpf1PdHURFo2qXIAVqBMf3JWwdDSYXOdZVXhrSX55/
+zi5xStaqeSklWI+w/iHmS945qfu202SNfLDMWAzVSj3Uruxcc6Vtv6oEn30lJ5cH
+GmzIXtEJAgMBAAECggEBAJl/YhTGiEVFM3J0PVkvUQGMPEghvRQFow5N/xezRZmx
+6wHgzLA7QyEcM0Ug6GUT8X8XRIFwfYr+9a9j7Bgo5Rs4ZC1n6WC8CGV3tyqstZcy
+RrA42l78qlcryxwU4f4xw1FWCZ9HFolIiu89VwDdZetXx9BioLEaznC2n6BgMgmW
+StxnR2KAwMxShrwl7B6sOt3pQZjcm+Sgrug7BgJ8sk+NPx/QLkeZnUf74XlYZgWL
+O0s/riAfCh4t7g5GA7rPODzFXXdEfIQV7i0YFdRN6ZuL3dq8ZLJlTige95X6v7P/
+SHfC3EplZsHC7cfAMoItvBVyf8A/fs4xi6GijO/rmFECgYEA5n5bghBJpVR5QBXA
+dU1rh1ClWtdBjjXHAEqF8LiqtL3AhmFEWgU7MFKTkefS4hmQeWvS0RJijdiPVw/k
+h1pAf2+KZ14u2AnaxiGXdln1HyWRbRDNqiWouBuKuPLK23FC0x6GoQOpLRPmKb/S
+hBgX1y2vPq3pCZFeo8lTI8hnc9cCgYEA38zFoLyGc4N6jF9KUhIDy8z0fOtOBG/f
+C7KNeHEzWS0sX73sPUm2WQmkLHtkiRM6vk5IVj4s+Y/RTzPSRDx6I7DyuBrs8whr
+UVPS0I8Z1b7Ceq1hXUtzmlWrwQNrOrJR9zG9H1MvuCcTos4WVvwDstS8hb43SXrM
+8MOACWHNRh8CgYEA0DzuXYZrksPLu5srQo8Mi7bPfU+mOV3aiSfK9J1SFHKuYnmz
+8ARz4gdorVQdEQp5nUlNsHeEtJQnhEemdqaSSM+z4gmUFrhof8JPfaxuKZKeXUPm
+G0dks9imLsujfDhKYERe609MY55rveJAxfiiaVQr1Fv4gx1jvGOiClz/IgcCgYBC
+X+wZIPDLX6o/6Z8UOi2QCyhTyEHqRPek837Lwt8UyrYHaz+eabdALwDXBH2rvd1F
+RdhkY6pZFdNhJyBshnc/EKLcAXhXGB8kDrVOj7J810e8tKFU1yThGBmJdCcgUHTI
+2KKboMNdXZGQTokHoVTDfB6xl9mz3Ezd902I+s2zxwKBgADyg4DvM2IzjoahNUCg
+D6FJK8pyakYKv3hnALFqQY6YtlkRpmgjs3yVSDV1xb+eOdXK354XySSb76QliwO+
+5A1+lvslGUcKmGI7z0uPZqPVSF5PFP6gt01ycOXFHKrhh1rAxv60wGdu+yI2KkWI
+yTroYav6+yaA6hYhLpxLyDgU
+-----END PRIVATE KEY-----

diff --git a/letsencrypt/keys/2110_key-certbot.pem b/letsencrypt/keys/2110_key-certbot.pem
new file mode 100644 (file)
index 0000000..1918a39
--- /dev/null
+++ b/letsencrypt/keys/2110_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDdd6LRZwS4cBBc
+6Xa0Zw8URXs3Zd8KfKMWBr8DZzZ7/R6nYpL9apoe89mtojR5fW9+zY+kjC+tIhdd
+Hy3JZIwPfBad0MNNSSvM9Zq1OtuBHl2+4p4fQv1y5t386oM14hPXRxLATbA9iHd9
+HVdskEnNL6Y5Z5izBVZ8s+TCMR8hF6tmAacbFV0jv8dm76H6QPxmlWa8GI2tl4w9
+FYFAEzQnUluGYESYZx2ALOzxcokMecnB29Zhu97xcCF2oV9C4JJoOorl7ZEzBh3p
+QnHKLACdEbxDynMpQmKu8woqMTwRABzn5U0Vw4iFXdwEhF0f5rAzVXRm8Cxx/3aa
+vyCACw17AgMBAAECggEBAJlJgi9wH4tNPXYhvaC2KHC+er9oSk2m4PaQ6sr/OG3v
+T7VJfDXdABnmbEdLGwjv8ikRPJgG08UA8KzqtLVNW8gn+jt3UIaA28k8Qb2opF+l
+VfuWPR2kL2rFMucopnK4LUV3Exp5az/b4eB+W5Fv+TUFAwd+lelrC2a62N40Q7iR
+sLy2vWiObNILba+xAOAo/Bmc9ycVOlehKFmxHp5zla//xozwNUx8F6FAh2/U/Dmx
+G8I9frvw2Ynj5Cd/dU8dATGRuSksBtWriUNp3W2JSJ8+gUWS9i+tbw5AMrTx2Q8Z
+yY2zouhi2rEe1o88/zaBE78Q/g7fABERq4LqLWuSnLkCgYEA9HnbYlCTAFUMad3H
+4CVhbH2vaojaU9FAJvBkXym3MbxjRhBoR+t5rjbsiAkmQOhkQ+Q+y5upU/Uqumtk
+g9iS3q1yXU/V45A94JMxlON9IKdEj1y52KQZ1gOCnLRJ4dPUoo61Y/BHUo+CyfUZ
+gjnFTvqBgNNT5zhTofRRVYz8ySUCgYEA5+gg6BZdsZ9mbXBUrsn/s3jyFKus9+BZ
+5s3weD1SYACiQoVjbzhUBJ6wd4G5D+jorRwCADe7ReLwrLe/jwOwhpJiqvt8D6rL
+RUV6gyMcZNjtko4QUS70TtzTM835jwvpyceNd5XigDgdS2YfbPVgt3YUXfK+mGC+
+Uk66ltUCSh8CgYEA3edVqFF2fNC1qcoyyFNlsLIMbOi3M2k1j6KXmIEm1TAn88qk
+vNMR6X3VCE01uai2iaE9Fla+RYS9OeSModgMx64rpmL2w82DPLqeQISUaPUql+4U
+in25LbaV8WL7xM0frkVWg9XvBxNYJbQhaUDCxUNAFQy8lZ1c3B4FTV/hezkCgYEA
+qYoixInVZY3LLCb7Qe2banH5SPNZOL5j+0CDlOP/3P+ZoFg0IZNkmRwKltPXn7H+
+qM/ZBp+34ZfPq/WJrdxcqYVLbQT95dZPVQ0+S7DXiUKuLH5/n1pccWsvXKgw0ks7
+V7Dz04FYXbSodf7q6pVZZ8aDjUtx26Sefz3fW3XOfrECgYBMshjnga3QoHEBKlcl
+1mrBtNBx0/gZBmdS42hhj3LSSCEcCIzY+dGldIjQ5ffJm+L6B+tkQNYefL6oJJ1/
+T0F4lIEt2VUp/dz7QxGAgGcxHfZrkZrkFFkyJgt+zukvqc60ioHpIorZfkGHhv09
+v0YVLWQLFWQoBRELg0L2fF7YPQ==
+-----END PRIVATE KEY-----