From: mhoellein <mario@hoellein.online>
Date: Mon, 19 Oct 2020 16:39:20 +0000 (+0200)
Subject: daily autocommit
X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=d057d3050f31a88f52f99d6e24f6d130d58e334f;p=vserver

daily autocommit
---

diff --git a/.etckeeper b/.etckeeper
index c59c4a530..4906fd5c0 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -4089,6 +4089,7 @@ maybe chmod 0644 'letsencrypt/csr/2195_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2196_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2197_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2198_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/2199_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'
@@ -6289,6 +6290,7 @@ maybe chmod 0600 'letsencrypt/keys/2195_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2196_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2197_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2198_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/2199_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/conf.d/templates.conf b/icinga2/conf.d/templates.conf
index 1fa2e38a3..d42aea577 100644
--- a/icinga2/conf.d/templates.conf
+++ b/icinga2/conf.d/templates.conf
@@ -38,7 +38,7 @@ template Service "weekly-service-check" {
 template Service "daily-service-check" {
   max_check_attempts = 5
   check_interval = 24h
-  retry_interval = 12h
+  retry_interval = 5m
 }
 
 /**
diff --git a/letsencrypt/csr/2199_csr-certbot.pem b/letsencrypt/csr/2199_csr-certbot.pem
new file mode 100644
index 000000000..f4578a8fd
--- /dev/null
+++ b/letsencrypt/csr/2199_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrC
+GhPUgkLBaXCx8U54+eXlD1k0LklY/ytufLp+mBDm6VoxDl/ai8A1oNBZSjPvy5W+
+/RkftWUOpv0ppYXdStanA4a6dfKtrETxYWGLsTh0I/jUxWJnwEyyc849EPp0YPuA
+DBUlMtEf6m27vaKG1dWQ7iqVd/hWQo52QNNvUuRms94/Zx0qQyW/424CkKs82D5I
+SRWRSdM1oyBW9YCnTei9LNd7YjsxvGSdpxq35Sx/mXX7DFKl0d5aj9EPOlagvBzH
+iAWm1BRdRTEnMoZoekHtUkgpizzAar4jJ99XuNqM8pjG+Vh6DPjyXAg2z5Jrlhtr
+E8Ie7xFdSScM3xkkpnkCAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAt57yXgKHh7vo
+/oTjwjp+QzkIJMUqvugLJ0ggpaCldJailahpGWfCip3/iuOtAnVtpRDeeqf1ZemV
+ayll/HxD7P4kUMRmn2HSD0VCDZH2PeLxRC5VPTpiJoGA9bKopAN6SFlVC8TBpuXb
+tWL/kYsT+rCsT/v7m/sIEr2rXk7ELDjRxr4Wf/DbOhT9/AXYhmAq83LI2bHWaxyl
+q5DI3cSb0HjUGqX+rv9GxH1UebPyqIZj7POA7x1ORWD4Vw0Vwpadh2OAdA6KfC1c
+t1xPxZiwOixOV+nNNTxm3gLF6L5c2jJ7YvS4DVPGY4/xjQm7jGbVg/jgB0pMa3Kv
+7ur4YwSDXg==
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/keys/2199_key-certbot.pem b/letsencrypt/keys/2199_key-certbot.pem
new file mode 100644
index 000000000..f3c117f71
--- /dev/null
+++ b/letsencrypt/keys/2199_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC6whoT1IJCwWlw
+sfFOePnl5Q9ZNC5JWP8rbny6fpgQ5ulaMQ5f2ovANaDQWUoz78uVvv0ZH7VlDqb9
+KaWF3UrWpwOGunXyraxE8WFhi7E4dCP41MViZ8BMsnPOPRD6dGD7gAwVJTLRH+pt
+u72ihtXVkO4qlXf4VkKOdkDTb1LkZrPeP2cdKkMlv+NuApCrPNg+SEkVkUnTNaMg
+VvWAp03ovSzXe2I7Mbxknacat+Usf5l1+wxSpdHeWo/RDzpWoLwcx4gFptQUXUUx
+JzKGaHpB7VJIKYs8wGq+IyffV7jajPKYxvlYegz48lwINs+Sa5YbaxPCHu8RXUkn
+DN8ZJKZ5AgMBAAECggEBAJuF6JF69r8Asf3XMUxYEkMQbaerfKA4LMbOS7BCm//3
+S3yAPag1Jwv5nOHkeZamqrMZSUwSy8xMV2ObuuuvTRNUIeuge3iMiFkhaicBXaPV
+k98z0OwR2mIEecvVrr3jDKBkEavKPndITMD1BwbBonEnMC7mKfH0Y5ifgXyRyEXK
+kkm+/HnutYl6uDBd1GIgFWoLczah8DLDU8n+9s/s8AniFo2vt4DXQftWI+IoxYvj
+1SLIsqvuBjIW3wqcTlBnDIMK6lohMdvwPn9UIo8J3r1mXm4VmlOndxCR+e2EDqj8
+paUigKDD9op1g3n2yyv8emqIhmWphVn/r5imoz/YqcECgYEA9rY598qd4s27ZXcM
+5unzPRCb8IaWPG9/EEe5Tku4jlp4rhiASPx5q4dhKhc9iHkWob+pKRk6OSYnvyxO
+vaqCSeWo0fWhgdY/C7gwAwkx9jZ/slwJindj5cwszWDRrGf13Sioi4eX1M6nxR0R
+hVZXk5MHCjpOEJQbpl3mbYCIybcCgYEAwcoND5cXv8VKgdC682FtEe/m5hhzU9cz
+WmuNqda5wyBOszU7d+HPsZyncKqO0KIary58t19km1iFl19Z7NB+YE5GppQOkkZd
+JMKnUnK49yOlVRNIaozDqiIHHaFIJjQ+msu34cFAX9/vHJZdVEdMyy/kOHIzlb+A
+yLj8Ik/A0U8CgYEAiMROcGKfkjrw1vffbCdnk4Ognv9NS+WXcAQC4zew8SGQYxrs
+CwoDvSZIpBfMIdrWxAZHFaSJlWLkh+NdJ2Hd5m9tXi+oQBzwSGPsIdK4IsDlm4/Q
+LjWvaJX+hEBXHBdpwhenD+q0LeH+OZS6wMszs3i/X1khK6mfhmPpuOyXaBMCgYBm
+hSz5tXZT9tze5n0w6rbYCXG/AupoTW4WhNXSJw3pY7se5aeLWYQWM4kFesXJLCkv
+ykkifa3s3Rz3ovMg7IAfFOodkDBRRDZcjzoTzSt7W3lJE8V40PVmmU/oZf2UcIk6
+PVIPdbxHvGF0XzwKrRm8WJ7FGe2eaEyKZArHYCfi0wKBgCAyeqOp7NXbBCg7uyzy
+hB96CAPAmfKv6ckRIoUGHXErJMMDGwXfkfRmKi31UDj1ZTzWkMxodtpqEFupnSf5
+5j9a8kUEukg2ZRxKZ4kUMkbGLDbFTwNQPD5XftKCi0o6VyC7lCaBq/MXQI3kTkF7
+QQ2Sg0fH81Gfh8oKh+jx9AEC
+-----END PRIVATE KEY-----
diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem
index 68ac2f9dc..ac9858382 100644
--- a/myssl/dh2048.pem
+++ b/myssl/dh2048.pem
@@ -1,8 +1,8 @@
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEApn368ulJxo6+YE7SyrPVvGwZqzHv2/czSYy4ckjFfJrDnYZJljEr
-yBtpdQrnhy263iFtlKGRP/up/qmv77i7+1MHK7b2fMYg5CYO+0ndp+2OkQgewKzd
-GPNC2eNOztmcY7sIWC+TnYK6xAKbWA7Cs3yiykLJC7D5aI8D9X42j4f5BBGebFpD
-c/5B3vOQYKmwAMxV2wEpiOTwT98OXOOrMuwcGNZC81PKRyMkiAHi/bZ+GN73qoCd
-hn+4sKxpWRALdjdRYF4I0R9s7dNyAmNlTAtqXyeruwXqGYSjZBJMTDtAfeTm7RNx
-6lIK9VH/7w2+yfJzkg5v+4hxt9FTStV7uwIBAg==
+MIIBCAKCAQEAniMxrfSvyIJzjHffSAXox7Xd9x4VBQvJH6evga5YS90t6Cvx5kan
+ANjg889M4L8FT3Q2YbeTNz/F2tue+2fOuQ6ruKX1T6fCE3vRhE07SyMIcWNpXSLX
+PQWQLMXQhGenpwN2edNOGYugLiFCUWunOoz73xkC583nfHR0uqVheb0LvE2pwK6Z
+qtwsTdlWzMTe3LnQeS5UBz10fZiUlrMgm/lC9CRnEdmSUrzKeqRebYGv2Zz4HVXk
+Penm2GASS5R4EsjKKuY4vyqdSjg//hod/euXztRk3+ggOaDvhE/aLqQLwSyF/qCe
+gEzF9j3pvy1OiJEfViH/oFvIfjffUUt+8wIBAg==
 -----END DH PARAMETERS-----