saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index a04919e2e57cd0798d4eb2d770e663d9d11df1c0..f5a9b03debd4e98dba2dbbcd803259a5c5b21710 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1561,7 +1561,6 @@ maybe chmod 0755 'ldap/schema'
 maybe chmod 0644 'ldap/schema/amavis.schema'
 maybe chmod 0644 'legal'
 maybe chmod 0755 'letsencrypt'
-maybe chmod 0600 'letsencrypt/.certbot.lock'
 maybe chmod 0644 'letsencrypt/.updated-options-ssl-apache-conf-digest.txt'
 maybe chmod 0700 'letsencrypt/accounts'
 maybe chmod 0700 'letsencrypt/accounts/acme-staging-v02.api.letsencrypt.org'
@@ -4321,6 +4320,8 @@ maybe chmod 0644 'letsencrypt/csr/2374_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2375_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2376_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2377_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/2378_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/2379_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'
@@ -6700,6 +6701,8 @@ maybe chmod 0600 'letsencrypt/keys/2374_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2375_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2376_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2377_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/2378_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/2379_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/.certbot.lock b/letsencrypt/.certbot.lock
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/letsencrypt/csr/2378_csr-certbot.pem b/letsencrypt/csr/2378_csr-certbot.pem
new file mode 100644 (file)
index 0000000..92536c3
--- /dev/null
+++ b/letsencrypt/csr/2378_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMs5
+Co2V0ddxeabJljcwOZZaoJahDGyxs1hkmpOZ1IhFSVXSzFjrguF7gXo2GR2Gbh4j
+FzNp5rJlNJA5YcLqCaKrz8SpldM/AAAo2nlw4NB84YnAU2CnFU0gdbJQJkwAtImE
+lPU8PryjTSfBlu2yUZOHqXG2uknLx+m25LB2Zidh8PsxgAsdKLVv75K9+hCBSA2b
+uwCu9kly8NnBEJ2vBx12imYkrU7lJoVk9S+0TlQcYexhMA1us1vARwPGwblmG5Em
+RACM8J/bk6qb8VDb12ZVRyYukW1Gn7DjfR80gGPSJR3ZqPAw3f+b3p5ktTeG9U0C
+eDSrQk1AJ0vJjqlLa0kCAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAqGpfuQihRFxm
+aoZufhkEoX9LJ+GsUndxHstomc9Jwd2++bbP1Bm4/q9ruF9vOxBgM1mkG4nUf8pV
+Pom/DPoK2pG9nSyrBwVE4rPrcyBvmkzmTDr52qEddv22UiQbkvDtAUhaRbWrz2Ah
+yCeF4YAdSJqqqmsfiP167Dc2xU+zKJQVseoevw4AXeWBHfkwRx6HgO+RbLKxTIVl
+jw3GZhAS1xOEpugpTrfH5AWJl8CYqSrQGCi37gOMz8rfyjbaBdXDsUpt0u0EkxWC
+iaVREeeFa3pxkaBTdi3FTPk0ARVRckkq6CEDSBEne/Sr6QmdyEbRv06aoKfjY0FV
+A4acSALQ/Q==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/csr/2379_csr-certbot.pem b/letsencrypt/csr/2379_csr-certbot.pem
new file mode 100644 (file)
index 0000000..6f6c239
--- /dev/null
+++ b/letsencrypt/csr/2379_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMLa
+3g17GcytsVjxS2CawJKK2OLWNd4itLJJ+oCmj+Ggl/Z1LOFH0SIMqmuSVvQtr4U8
+uj/upp6Sr7rxPhNpgk2ywQbe3Hqe0y7/zVChUI5CrKkDDVi70zw/KMintZASJGP9
+Cvt/Tv0D31li03wypNaUQdSjqg/7X3QAkoGEcS/ysUn7ZtzpcVFZhyN41BGPrtUK
+Q7ORAdQDu/vRT7FwSx5v4j8SU9TBh63kN7VY2CiGjqUc0BoeJmParsUgtWEjNqy3
+rT8NJ0FY2X/5anXD6j/YSRmRY0eyD4/e1f6FRkrRuLN2irXdv2CYaUeutT8auR4Y
+KABS/ovyrt8vmviBNR0CAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAmi1wvwF67ejp
+raJcWSTnN1MYFAT3hxPWXC7udrH9MJECzAimpcwScjEKBfTNQaFUTA/vk61GXAbb
+BGFSmIZnEqfniygk6zxK0Y0YEkaYpCtJrzSXL1tcpJtSP5wo7Zurr4m7XCaabS6b
+mfaqofoIZluLEZQyF3H4Rd48TCNnvsV+MqYyYQWt73p2SGVLQTk7sKpGFXv8piyu
+pstTO2SAqPYmvbuqPE8TJnp24q8DuoYs6C+LTftQ75M5kMh2l1VZAGq6nMgCiVjy
+SdKr3MDKB+fhBMvojE9h1gfXQNucQX4mJyrDUtPQqF1BTJJew/YEU4ZtIb5YdO/n
+/VrxHXFlRw==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/keys/2378_key-certbot.pem b/letsencrypt/keys/2378_key-certbot.pem
new file mode 100644 (file)
index 0000000..1644643
--- /dev/null
+++ b/letsencrypt/keys/2378_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDLOQqNldHXcXmm
+yZY3MDmWWqCWoQxssbNYZJqTmdSIRUlV0sxY64Lhe4F6Nhkdhm4eIxczaeayZTSQ
+OWHC6gmiq8/EqZXTPwAAKNp5cODQfOGJwFNgpxVNIHWyUCZMALSJhJT1PD68o00n
+wZbtslGTh6lxtrpJy8fptuSwdmYnYfD7MYALHSi1b++SvfoQgUgNm7sArvZJcvDZ
+wRCdrwcddopmJK1O5SaFZPUvtE5UHGHsYTANbrNbwEcDxsG5ZhuRJkQAjPCf25Oq
+m/FQ29dmVUcmLpFtRp+w430fNIBj0iUd2ajwMN3/m96eZLU3hvVNAng0q0JNQCdL
+yY6pS2tJAgMBAAECggEBAICtcJIwEDvDnUzPje8J+RzL660U8oIMjsvkf8AAAoP6
+ozHVlRCkpy3Q/y37/TElwqoQfAtQ/gNtc7fyrYU2nb1D3v3eh4DH/l8bfyKwJ5m7
+yS9o+SJVCXbZm8y5VVaAh9AfhBY3/F2DZUJMIR4G8AJjPxZCpng9sSq6ZNmbTpmW
+F9wvivvIV0mQJnntyYn1tf0wCOeHSvJWHsB2OgMApbVyuW+yuaYXOO7n8sMQxUGd
+hm2mjnO30x4NpVbXs7qeFsAz6ZFf8m3lRcaEb1K8qkhbnyk1HGykMD8BjqgKOtKn
+8a/TFwK0D+iFVdEmiLGnA6KgyUP8c32bx7GrIA21jSUCgYEA9UpNJYinlCpljXSJ
+EKTawqRHW6IN2v5XRSDrbhh0J/DAY7wXDqHoVnzmco3ABmv0iug+NO1ZirlSJKpK
+ugl2pBG+C4EWl3gKF8Kh5vUGMtZwJ6vTo5lBINsEQ1LmM/ypeTqC31SCNd2VObEh
+BYCy52vvWybqV/R0Y/UrHo170+sCgYEA1BiJc1UHI+VEdYmztYJIj0B3FeqnoW/h
+vgDyDAE7PM8ZPw9/Sjcm54Y/C18A7ohNGeNqbMb/tBtSXucSXJ8pptNMASpQG2p7
+0MHuMl1KX/Lw2no2LPh+5fUO3zm8AszFmwd9zuifgf97yZ+4+YOjhrD4r4W7fWTG
+U4Bz7AwbVJsCgYB7zbK+fQjH+dYj3WvI4MwhbbUuhM6ld7YoiAMMIH+QIS2ZqTei
+BQo1jPjrXKxNEXPuIGY1ZI7LO9o/80ugNmKRUPsw50i1zrqZX31ECuvEAQO+ojVB
+33pF0QWHzXGvT5liPKwNeKP3+Az3f3WBR4IE2C+JPE0Pc6zDPt0yoIqdXQKBgCts
+oqe0XvPgevW9rceZ1xVNU5RvKMcKyyNFukju75vxou+gUqV1SUfZ2oqPdvdffLmy
+MBX5YF0VwvWfRckk5Tg8xrDuYtxaHuOM8SHqq9GdQebZYsIuVnzqgZL+lRnVpxeo
+nv9/7TiGgGe1hf/ADfkDvsbhEJQJz/lEsXdAu0/FAoGALlEC+0oLv4Gl47rNwPyE
+EFCPBdaikN+4JYzlTvb3HGIjpcvO6FZ9xqqz3aVNn/ipH1TaFom/3nGXayeilk5s
+dO3TN3+lzrs+6vICmnCP5DCLuYov0ztbTEZcyKMu99buaoHvPKYRybuiWBreyIcK
+IzrYCV8L6vJ5g2zCjS8HbVc=
+-----END PRIVATE KEY-----

diff --git a/letsencrypt/keys/2379_key-certbot.pem b/letsencrypt/keys/2379_key-certbot.pem
new file mode 100644 (file)
index 0000000..e1a05e1
--- /dev/null
+++ b/letsencrypt/keys/2379_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDC2t4NexnMrbFY
+8UtgmsCSitji1jXeIrSySfqApo/hoJf2dSzhR9EiDKprklb0La+FPLo/7qaekq+6
+8T4TaYJNssEG3tx6ntMu/81QoVCOQqypAw1Yu9M8PyjIp7WQEiRj/Qr7f079A99Z
+YtN8MqTWlEHUo6oP+190AJKBhHEv8rFJ+2bc6XFRWYcjeNQRj67VCkOzkQHUA7v7
+0U+xcEseb+I/ElPUwYet5De1WNgoho6lHNAaHiZj2q7FILVhIzast60/DSdBWNl/
++Wp1w+o/2EkZkWNHsg+P3tX+hUZK0bizdoq13b9gmGlHrrU/GrkeGCgAUv6L8q7f
+L5r4gTUdAgMBAAECggEAPWZQMDlJEOjuiFNIaEF7SvH7k8biJIQVIlUTXXSew/8h
+w2R65uYFbVBGZy0uvzSiKT7QhZLC6BbazvJzmBRYHfmkv3B8Uxs2+olaffzG8Hzs
+ATnX+8z7q/FO/aNzH9nHo8Y5rrQYBLwypezxLSKcNI11DPchgHW6R0hi4fME45Ft
+5Z2Nsgq+9Pk+E3pfmWc5dNHpG+zqPWO3JkFDq7RigN+1uubnk0t/oWiFoiBVYfow
+OCf+0JX/QqzgTAcKeEVybzyce55B45L8UdTW4SENVwaFTKMTHaRlXiguSI9MFiky
+Zcr1x4Fqe3kyNgylnl/zbjSdl2DAZrVq2G0ZyVi5lQKBgQDuOU60wUDc1Yz++nGX
+e653fw4snuobf9ZFawr4636XKGBboDTQ1wkZNsonAhpPNvgif8i5S2fapuACoU0x
+j5uUC0JGbKQ/wJ3nLf+PJ/45pz7ksLBrO0knKmKjR5pzAPm6Pph8KsZGgtBgRPnl
+wVGWXtCA4ftFMdzvyjoLY+nLAwKBgQDRZRn95JAiVxP8EinfGzTLiRDt9qoe6kAG
+wwzAgNhsh4S6K4U69wmt1leZ1aUcD7KRdHo4l9XMGHav8mWwLoEq/v1VKp0y5oHM
+z4nCPQzaL3QvsqVLl4qs/E52RCfevLTEw2toLTXrBuq8pSbWa7RckywvSB1W2yWo
+Gcg5aCf1XwKBgQDcX2MxzzyDjYGbNm7yZVXl8UFZgcCro7zCBt3lm2RFzPImkLOL
+JgGis46aO1W/ReiRcYhr8Renq4u6oyDX4jNX5npuz326BCOOgnzRH3wMNWz2/YSW
+DggEFS+eQFTeYl6iLdm9s4wsGkNNa0GJiyZAZoGXWHWrcw8hPAAqHUlfpQKBgFxT
+F4K6pFJ/0m/yEkQs2rpjVPOXLqsy3cgdeCHorYQsvHjZd4ToJ3xeZYGOkZ4tza4U
+jU8moz26C5rIZc2os4shotFKWMV4nQKQ/0yFXoVVJwVg30DVMG/VT0MWCf5LdejL
+wS/Nv1hBVH6Y0ub31i57NaAjS8xgE9pqg73MDtJBAoGBAOMShgXqo7wJvb3l3w8r
+ZGuJKC7nPv4WAhd1Md+lTOWtgtEmTv7TU7eYqN8g5AyRx7cz7akmwETeHFss3XJC
+IOc551F7f4P8t+2J9jKhEjyV8EHF92mlBl5L8YI8S2UmDC5tWddzLHGLrInZO3EX
+7v9rSNSOE1SazmUDkV6jnqdB
+-----END PRIVATE KEY-----

diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem
index 0d89ab94566d888a12c9ee281d89d9d9ed6bd5f5..c7f28df2e67589d58e56104b754df72dceefc54e 100644 (file)
--- a/myssl/dh2048.pem
+++ b/myssl/dh2048.pem
@@ -1,8 +1,8 @@
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEAk+B3a6M2PybCiOGhfSEbncBjRgVj5AC3BrO1PDdeRLCQ/xn/cyvP
-jzSAfKHLnGBmUh8YWf71uuDchhtVC6eiCdoqsamM/6+lwAVkSj8gaGKbsfbU2p2l
-7bxEwpjb6vlfdUkRi0XfCggLQcTxMRb/irjJqzj4Mytz27Icp7aaUHi2Iq+LKZ+A
-viZVhoqqHAsPvumAD6fxwKY2aMuw1PTrm/AL3FS9YmaIeBu23PzLoLTs9nx8nM70
-2+nd9SC3B6sk1iXjiLHzo2DxwXOTAWKzvBL5fQCaoYjtvwyTUtIML05UT9egQdrE
-V+dGiIzs4GczzbZ8ZF2ZDPCKafWFoxtwcwIBAg==
+MIIBCAKCAQEA4mB81uKu8oKGSk7J8chD+/9xPHsQ2g64azvp0T0aYNcPYoI/A1Ef
++sbIpgA+Rdt0UGtIp6YQT2d1Sbn5Rs65dY9sOTxfTcEQJyV08+vDQlJrTfecUdFD
+mebN2iNWG1tnOjgbcjcujBU2OXqW8gDkThpokA2CugCs9slGLHepW2yglPW07x6M
+Wt04h4lIvr1BpAV+GJewsQndYFI2rS++9buOZBdeQiPfon5tlZujNvBo9FEOsmlG
+E2o9bhBgMuEKzYIfBjkZNrCIhM8o7PHpqv7wp9Lx1+VcADGciIe5waBcjAygj4DX
+mI9IuX2eHig3yeEgX0vi4YgE3tZsq6cNmwIBAg==
 -----END DH PARAMETERS-----