saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index 514f12af5ca598a7d898270ca36aafa0aae308f1..d562bbca84cd842bd180b04de68cf9d5009cee1b 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -3866,6 +3866,8 @@ maybe chmod 0644 'letsencrypt/csr/2018_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2019_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2020_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2021_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/2022_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/2023_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'
@@ -5889,6 +5891,8 @@ maybe chmod 0600 'letsencrypt/keys/2018_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2019_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2020_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2021_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/2022_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/2023_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/letsencrypt/csr/2022_csr-certbot.pem b/letsencrypt/csr/2022_csr-certbot.pem
new file mode 100644 (file)
index 0000000..5685c45
--- /dev/null
+++ b/letsencrypt/csr/2022_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANEZ
+4ibVhHavRW8L3ItRfAIFiWWHIoIBcQm/V9hyeW84OQ5rRfQAs+7Nqt2TUe6/Qb6e
+3s67z2aX3xqWRaqzz+DHhccH3Mq0Y/FLKh0fZ3Ci0P5CC2DOh07+Ahc+1ymTzTsY
+HlzUYLzqG5oB1Vo7NYQdCZ7nbaUh0Rhc6AxpraGDSbZ9PAC2p8+DU3iam0LfQxOy
+t9xrkkTPqp1ziXGqWhOYMylIMTwH2Z5joYVviUmcrY9tLrdp/MEpwF46zXlgzI3p
+DyFUWWQ/tpiUD31mnOlLhC5OO0CHFn0JgS83R8Z8DF2iwZ5Oxx/igJJgQ38sIUuk
+RPOJfwLcG5cG8SNj57cCAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEANzKW5VhcQZWv
+SnYIqsRrrph00ASCb8SVfgeeSVD5hclqnxgMnigV7MB43Ndvkn/XEYPxtKsVKu5f
+ac7pUrpvqwNZ59du00VILIwO+/aEpd42/c5/GaWrPnfF+Sx6lnF2glss6Luzax2i
+Fym5cBkqNJm76BzRWe5l0b/tgfJrdJd9ERlQzrCqlJBcp7JPdaRTcW3xdXdTvrHq
+iUM0vKgLm8dqni4Lhe7dPdAAIkLLPXOTqgnHqCWNpK0mOhy4FWzdEukPTbAyhDaL
+UZpoM0qGfhQOmYqFsliBsPMv9lboWBGH/vm0balhpxPK8CGQxzxzTz4s1C8/VM7f
+g+PRCwio4g==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/csr/2023_csr-certbot.pem b/letsencrypt/csr/2023_csr-certbot.pem
new file mode 100644 (file)
index 0000000..e4eb558
--- /dev/null
+++ b/letsencrypt/csr/2023_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwO
+qG9HzHUzY//t2+cCT5xfhEyA5duikLXKLTxIEjDiUOp/UiRlmYtisXmiI02xueG2
+JnTV/eIK2a+WJdDMhd6xUCo6S6pPUf7/mQ6M8y0D03j+7qRZN7Rc+DN+Gw39w3wT
+VE3SnVzoPp3eWKTe51Y2aivFc7i3OdRwitPgre0Z8Tqt6v98PJQ9ehpDEgRdaCSD
+/TgPLxUUj+5i99a2Y/pDK6LxtahUX4lca7oTVEQB6OXgF4ni4DCeu4NdnvO3X1c5
+np7BqD9GTLWlFdhs89Td1vB5xg6ukYXSazwKKAdz1Pg8H3XpSbn1okQr2hR7YMU0
+BxzTL2JKm6+SizLbjdcCAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAU2vAnV2367U4
+w6FQxafNO5aCVAX31weI1Q5uY6VG6byTAtA+CTtJ+k+ydJ2FX3jlgP+CYXg0I0so
+S2Ixi+wCzH8OXgzI/P/Nj5vNGNpMDCwakdzWZdccyUMXhnbQytzgITJjPDWLz7Ss
+ZTeEvju3jU9T/TfM12ijUwQ/I0XpaQ0I4g0DFuDZivu/hVzwgGV5VTO5pzBdkcPs
+w2CJfOzLyLbjnx8ztyTNbZr2JP10tWoSTkpUO8q3PIpV1lMdPWrd60r4N6vl+4lF
+Yp54Tl4ejpuu0ke+sibHl5MQT2g0DEoCgYqKOyPAUhnuFksbeLnr7ws4YIbgqnbN
+bfbemIbxnw==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/keys/2022_key-certbot.pem b/letsencrypt/keys/2022_key-certbot.pem
new file mode 100644 (file)
index 0000000..5bae8da
--- /dev/null
+++ b/letsencrypt/keys/2022_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDRGeIm1YR2r0Vv
+C9yLUXwCBYllhyKCAXEJv1fYcnlvODkOa0X0ALPuzardk1Huv0G+nt7Ou89ml98a
+lkWqs8/gx4XHB9zKtGPxSyodH2dwotD+QgtgzodO/gIXPtcpk807GB5c1GC86hua
+AdVaOzWEHQme522lIdEYXOgMaa2hg0m2fTwAtqfPg1N4mptC30MTsrfca5JEz6qd
+c4lxqloTmDMpSDE8B9meY6GFb4lJnK2PbS63afzBKcBeOs15YMyN6Q8hVFlkP7aY
+lA99ZpzpS4QuTjtAhxZ9CYEvN0fGfAxdosGeTscf4oCSYEN/LCFLpETziX8C3BuX
+BvEjY+e3AgMBAAECggEAK9rC3KQxaPbvmA+jzLBlUsM4gsupyBxnScUQtnujzli7
+VrPW8wrmsfH+oQQRzgHc1w7Y6gDnybuWdiwIJnoZ4inWe9zBSN42i9fY2EzK1AvB
+y2GsozwNktqhM6DhXX37MCapz4xXUafD7DPwPEFowvGYH/SnwVdrVDHAFUJgwRu3
+n+fqdbgu9RpZG0RAPl4RUc58V7DYbCRkhCDIWPHpUYce2SYU0g3tzVS9mE6uY8xQ
+XHXkfWaJ7TzkAK/s/ySvdDLhmXcd3JJSPioEb6ufZY0gORvNXQa7vJg1kH4QZHu7
+TFwVUfaGHhoMyO4rOPuoEW0nvd/PM2afpm8dIskjuQKBgQD4pO8yv35LUPCTpp2Q
+Ex2u0Yy2RKqX+uvPfPMfxtcfO1UCc0+TLdGbkZ93A/P5Y2bgioDv40mrV9sEuEfT
+XnOIaUzg/2txCj27q8Zqxru+KM5bCA7RhF3/SSEX6cNsC3rTd7wWS7tD+gzlCVBd
+INjIHIrtieJZCaQvExLyR1tt3QKBgQDXSXm6Z0vUlTJmBJX2tMnV+DYFWgu8dDpg
+D+t6kLCCDvSt2M0XacbeKew/kdlOoOTCvhGbpmIAi8Rh4kIQfbgxS/VXdGxzGD1X
+Y40YxX3oghXof3EwUUUk7FoOxzg0aY43nHlwmONpbwcAx/DZZxThG3uVv/glmNsw
+dUy21rOEowKBgF/lXMu5xz/NC7wmeoZimQQflaGGgjTzdZcknbAXxEgrXfH//yTI
+exsA4vvH7oS0razUPj5G7tbCn5oGaM1AlFZ8JkZwvENwq7aB3Zi45RfGLTA2v2BX
+KNmYnsbWRaSaGNkOSOBgfO0Ot4JuQSxpyrIDMCHFGCM28LenJ5uBoeWRAoGBALjV
+2ZAjnaRfkAysxUAyCdQOLfs8SzU6qN/O60KotRKE2qfjqnn+lAIsBiyyANuUIbPd
+UerL1/pWBX5wrn3QInMYnwS97VqHpirASuTIsogMH9kkib6NGAtSbSOhAW1mbvbp
+/g2hBiaAb4fJIczVxsRaPynbzqYg7ZdWLk4QWcJ3AoGATLJTA+9tuca+gKphLTlD
+17RytumqxZfm0NUh+1+PS+R8MVCzcCB/gWw03L4S5LMt6Qrn5klCwytk9o+ft6zw
+qw2WtgeltZJfQ/hLAxF8EVx2LmZBjkpG4DkJZnXOBxeiNthAdMrglKlJ6kjuQUc0
+fpZNzfmPqZTkk9S9PKuKsu4=
+-----END PRIVATE KEY-----

diff --git a/letsencrypt/keys/2023_key-certbot.pem b/letsencrypt/keys/2023_key-certbot.pem
new file mode 100644 (file)
index 0000000..44d6707
--- /dev/null
+++ b/letsencrypt/keys/2023_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDMDqhvR8x1M2P/
+7dvnAk+cX4RMgOXbopC1yi08SBIw4lDqf1IkZZmLYrF5oiNNsbnhtiZ01f3iCtmv
+liXQzIXesVAqOkuqT1H+/5kOjPMtA9N4/u6kWTe0XPgzfhsN/cN8E1RN0p1c6D6d
+3lik3udWNmorxXO4tznUcIrT4K3tGfE6rer/fDyUPXoaQxIEXWgkg/04Dy8VFI/u
+YvfWtmP6Qyui8bWoVF+JXGu6E1REAejl4BeJ4uAwnruDXZ7zt19XOZ6ewag/Rky1
+pRXYbPPU3dbwecYOrpGF0ms8CigHc9T4PB916Um59aJEK9oUe2DFNAcc0y9iSpuv
+kosy243XAgMBAAECggEBAMCYlSFzAucbuia0ufkvlTRictxCTLEgnrT2PfvHimPZ
+N8Ycpcr0mheU7y1+exO5y1feNC3SS+4tj4jKjqakYzXs5Vz16LS2aQ3k8PFq15qF
+IfPxqgw0qP7zQNBZFe/+s6NIGynYv+4Qxgj682+pc29LrKnjk3WkelCoaF/SkFZX
+lIGVaaW8EmO2vjAweRhnmE/AnNMr5Fq9z8UAoK+14f8Pk3Kl5l/YhrysZHx8sRoK
+aiMCi6q9RZ1S6OWa3f8JRaUOrSJOuBG3EzuOugnOuvhTKGo1yOHcOhu6/jqoxPnz
+KLpu+ejwAOQOHqNLnLq8Sm0/fqTYOVx7BE1pH4jFAwECgYEA+7pJz6zDvfRALTZd
+QsDK/co7YFTB2yArMW49pq5auVCpA2/pvcGs1rLoOUXzIX8SJPZwgAh8whrQOK7/
+o8wYMJ8IKP149LTir5YKUoodRogIb9/4XtKClndzyWOavE58wSNoJdCf07n18+nD
+7qDwkt+NS1kS4v62yjiCjx7BxWMCgYEAz4VACZjBiG0Ykw2N9zkbSSWaaBijUHxi
+ozk5bIEhMFY6EFn+ugeA1fXlBz4WNZa8GQlXS5B1rWdrKGgEtDGoKzeDXMtIl5g7
+dwl6wZ142FAWB1LdGlLuBFwnsi2QIldkU5wMC0sOfGgIJVdzLT7+ZmyyEuPWsAcv
+S6tRwIpZCf0CgYBhoWzDORRp9fN2FaGyJCgWqnrA796H6EAYWdNbdEAHo7sJdDxJ
+tnYchyL+I50anrgg0dvsLF6GwfOEKItJsfynzuZRT428CvPoed7jCGI2Wsg667je
+vfKb/RRRRWpcImzMU7kvAW0bpwI3abDuOklUDZQ1ZwSmOXgXkjdA3wL0VQKBgQCw
+GLXvrtXD7DfnSaBHwwj5eFRfs1Ca0wJs2fl1rto4B2O8TnIO8KEOb1xLWg9EqEWz
+xS5zrAGABXt0TVh4hI7dJX1ud/6AzajgaYXm2LcccFFRI6sGVIsv3fe9hlaCHcDA
+BnJd/vIq9ai770qIgaUly2UNDJQ4ydADmTyFc6D9DQKBgQDmKRJ7aso6+n5D+fvp
+khsi+Z3NVZ+m5uoUwORYju3/XznIQLPRIXntJNeNxuiQtu9hpTNbS80Cu1JJBPeY
+4A6c3a+JtwQKbH/nc19McmVl51/S95z9a/iJ5TNW71gW+WetMRs2ocjNWaB46sH9
+A5ZwgjU7sgQzMy6dhi8NSHL8TA==
+-----END PRIVATE KEY-----

diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem
index cbab13e7b9021ea598a6cdcdcb06403d0df5de2d..1540c5d265312100402d3cc1030bccfb1b662f58 100644 (file)
--- a/myssl/dh2048.pem
+++ b/myssl/dh2048.pem
@@ -1,8 +1,8 @@
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEA4DCPXGuCpFWThTJhu3Uk3dkxToqfMJ93fvo7cEqGTYbK9/K5qn+W
-3nLGMka4ltp797FE10L+W3uQCsOqHYvs/DFF4zYhmRvZ8nUh5VYsPkXTwJgfeFIo
-T8Nkrn8hWLaIWXwZcJxW5hdOFdOq8oThmv7T5aAdWFyHffa/bomgcvolA6/hQIaa
-VMJXv+2Inhnya7EWWFqq/K86Lp2y1/eM8+6f7MO6o3NldAwm4t9Q1uBebLC+orl/
-qEF0HP8sjoh8J8fNujz8ODcS9L8NvJYCZHIlQ1c2xOF/zLyjMAmdJFU+Ko8qP6I7
-GWIt/EMnOlFKlLN6i9RRBrP5zGNctHuvkwIBAg==
+MIIBCAKCAQEAoq2lm7/3pZPeRBUF7PAQViEZOua7SmkB4qBUBfbHh0iHU3L9Ohbr
+ZPNFd8/+xNp3jgUtNco1lGMRwvmP/2leXW1KBae6zz+iKdLHrDv9FbQ9XwucbXjN
+2KqZe2ByYBsL6gMKFprI0yaGBHjYZK9ks6fKKBvwmjfBpgLKkj3++0qUhNjXPOpi
++0o4QdRxZSQSeC4/kXMLDuRfBXad/v4bd/GZfJsLdkfOdif9OjsKORdcn2Syk/Ex
+10/5tA/uSfX3EFptg/K9Z0F1hQUpKR53UMRa63X3QEeSYbabdk20QZi009crguqI
+DcU7OvHz0VXtNxwe8woXspGdOd1TMpcLGwIBAg==
 -----END DH PARAMETERS-----