saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index bd2b7fd9c7c703d472005c31dd5a9aedb5f947da..74f8685ffab1e91eb06d8b773bd58d17596505c6 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -4119,6 +4119,8 @@ maybe chmod 0644 'letsencrypt/csr/2217_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2218_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2219_csr-certbot.pem'
 maybe chmod 0644 'letsencrypt/csr/2220_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/2221_csr-certbot.pem'
+maybe chmod 0644 'letsencrypt/csr/2222_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'
@@ -6341,6 +6343,8 @@ maybe chmod 0600 'letsencrypt/keys/2217_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2218_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2219_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/2220_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/2221_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/2222_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/2221_csr-certbot.pem b/letsencrypt/csr/2221_csr-certbot.pem
new file mode 100644 (file)
index 0000000..84380f4
--- /dev/null
+++ b/letsencrypt/csr/2221_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL2N
+hu08gG3xHZaJwlPxf92IB40k35x4TbCb9lZihx6SolX+JgkG4wmYVU3T/ZJnsTdn
+Js0Sg7qAJPCmrmZ/Zq/Nys+//p1NtCWOl2G5+EZWQzIIt7VAUSAcxX86KBqXEgBd
+4fSh+YSgYfFgh75Y39g6ULFO4278R9NLtv2H8sh0OQqwQLPbDEyyQ8pvLWiqWcf7
+kP6UnLGk3hIY1GTA9LPnsLPWnjCgsOAAxEpKA5pV7LVx0IZIglRcshXizbZXfwCj
+MpIdIatAYSd8Dv8aSugnhq/vrI7+U89759kMxazGyXU6kMFT2z5vx0mxjH1ZD7rQ
+za9GLCgxYjmwyCM9jEMCAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAm09gyel7vkZ+
+2Y2rW5F0P7PtOZj7Nu2jEKuyEBuoPq47TFYP/nXFPaOfhw3B4ShOXA03n6sR6AUq
+KVsb4L7Yy8B8nKiKmVL7RODUk1YHUTt64qbwO+0/w3CZfKwm84StE9sb3wzp7Mxi
+6hlqe+z2IUSyzZMkmtvy+G+n4GRZhVN5PN5XMaGqGN2Kn0vvsYb2t/AqSXZ/chJR
+WM3kZcnxgvz8+4Shnw4jbWIDtjqbacC1EFTSlktVc7YGoliHckiSWtmSogGxmcJz
+LHZRQ+T/peVXzx0MlieB5NlJBkZK2NA9Sg+NSnJ86//ra3I6YNVCbJ3oKrgkkMLa
+6OB32RZ7rg==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/csr/2222_csr-certbot.pem b/letsencrypt/csr/2222_csr-certbot.pem
new file mode 100644 (file)
index 0000000..45206e9
--- /dev/null
+++ b/letsencrypt/csr/2222_csr-certbot.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICozCCAYsCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMaP
+yXXEbk3j3SsFk3jCSJZwvU7Y3Zh3ytaGFK1kItNaBZrNzS5w8DekYJbj8roYOgEP
+L3eI5j+kMs4yyXlvo2mohdnoPLydzCft6GWjoQQynCtIV9h+/GGE+ALehn7cIkL6
+hXQTp+IcnoTEzappdoFbckbTYR6qWgx4RKZNdoHaPVxa6layiA6X1dRNC7kMhyie
+oyxZxTgTrDrbgJ3sIl9dUUBnUxe7i3H2sr2NMPauMbIN5ceWB7/fOPWR5oufP0Ec
+ohx1840oWSVVkADJX4cNAuQnpLnzHsUTVRtwBrDZf/2Xf/q1Zf3VvJRRBsAoMr06
+w+EE7SPvXbKT/8Y9OcECAwEAAaBeMFwGCSqGSIb3DQEJDjFPME0wSwYDVR0RBEQw
+QoIdc2llZGxlcnZlcmVpbi13aXR0Z2Vuc2RvcmYuZGWCIXd3dy5zaWVkbGVydmVy
+ZWluLXdpdHRnZW5zZG9yZi5kZTANBgkqhkiG9w0BAQsFAAOCAQEAsvomaeOM6Jio
+dpVsqlqrChXk7kUc3gUKV2TYIfxBqjctpOSYOOHnRJHMOiEXQkOEkOfNM7jCleIt
+iZE0qo2J0hkJzoAUEWrdclrGhxA8DOWeX4VFjQSmc60d5xpoNUxB2CQGwUcJJEjs
+99c//v/ugtqysYRtPwfP1w5fi2jFFAKB6FnzsrtlWZUWkCYZDjceRPWbUM810yu9
+SKzLxcwnwJuoYp7FSIY1onuAoD7MaYVCipFXjvBDB8riwPU++NMxzfbrkbhbJnz/
+lfCZ44ibi8EhiZydDkwB1JOfWmgHZlhucSDodcjRBm09wd6hPB+DoHiyEF4WYXK7
+97g7R1RSTw==
+-----END CERTIFICATE REQUEST-----

diff --git a/letsencrypt/keys/2221_key-certbot.pem b/letsencrypt/keys/2221_key-certbot.pem
new file mode 100644 (file)
index 0000000..91962a7
--- /dev/null
+++ b/letsencrypt/keys/2221_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC9jYbtPIBt8R2W
+icJT8X/diAeNJN+ceE2wm/ZWYocekqJV/iYJBuMJmFVN0/2SZ7E3ZybNEoO6gCTw
+pq5mf2avzcrPv/6dTbQljpdhufhGVkMyCLe1QFEgHMV/OigalxIAXeH0ofmEoGHx
+YIe+WN/YOlCxTuNu/EfTS7b9h/LIdDkKsECz2wxMskPKby1oqlnH+5D+lJyxpN4S
+GNRkwPSz57Cz1p4woLDgAMRKSgOaVey1cdCGSIJUXLIV4s22V38AozKSHSGrQGEn
+fA7/GkroJ4av76yO/lPPe+fZDMWsxsl1OpDBU9s+b8dJsYx9WQ+60M2vRiwoMWI5
+sMgjPYxDAgMBAAECggEAexrmbT7k3gJBSBpx9dibRYHp/ZXcEB/lvPSdmN7miEmN
+WrHze9tYKkwf4qryPVpQsv2wKnGC0eYVl6F5FKJbS4Qo2qIDt5/WhqnD0TlZcDzn
+6R/WR8XcqjFlZsqbbyF8FHbkn99uUN9knMInhszrm9/LtkvY06TO9QBweNoJKHuM
+t35VM+MA4GT2jBy2w20XOBzv0DTCI7H9PBHIR/bh4V3nvW/eTBqe4oUtxkrg3OtQ
+pRj1BF9SnQujJAYAlJbbZEOGKD3iLIh/PN5ZvnPP4I5QvaYCdF/wW+hFCmVRDV07
+skheiO4IyBqSqNkhVIj6cLjCeiyThGKsMJ2uA6f7AQKBgQDhVypfE1MGP05aTHtv
+q7k6/xOFm0QwP6DEFU8uwXUFymJx3YUizaR+9Dzm0F8G9OErKTmtsqs99Gvn4a1E
++5f6yrV2hy4guX80CdXfKx7I9Qohr0Q8sYcexhXkT3csdXsZHtqOznyrOUYJpzlz
+B9Kn206hiDPEGrpCQxgvgcxEgQKBgQDXV9eIFIcnJ4NBLC6PDsuucU8D3mr2ynEt
+TM5WGJxU3tPqfHZaaKCZOJn1pWljmw5FB9002CveHjxFqv8zUYOIZvE255Xh9ega
+rD12c+z8gdo7y/WHxuJpyrRTC+/ba7eh+jf+VP7iwW+1zp4fbXatfO8MPU6/NemX
+bgdvjH5ewwKBgQC/M27IbWUtD9oz1GGIR3VMEdNGspARQGvw9QPS8GOTHj6ZzxSA
+i2zgK+zhDD0VcgL81GYUdF3Im/RTNLIIrlIugoGmqN0C92JvjUjjq3rbmM+X9Vc5
+CIlWG03IA4VjO+vPTNa2BY7S2i4LUtD0QdcEhpkZhrAl3WfdgYCsDr58AQKBgQDE
+o+Uf0Ub9XRqBN9woLGWYHMX/jWn1hDVHHXzJp92Rroyq8g6NTj9gywvkAbE0EJI+
+PQklSUT9pnR5VcWGUigfNYmNDnqShR/2w1O4x/EfP2BN/FhwLQ/xdPWnZB4aKsnb
+8oaRC4JZBDSDO3Ku1iFqGMydS5qOBqgQ7JuDpDJ9SwKBgCmEogg8Qb6IeAQZle1L
+3Nv5MZf66bDtL0mRMfnFq0HhAhOIaMKeei/avM36Mr7sGsED8d1/GdZ7DUh6EJTk
+H5dTx1CxPnaOYFU1sFdq23J4ionuB5l3CIDr0Y58kTCtsHlxVzvpXzV5Ei/BQuqM
+qQCdUo0o1alp+xIvBvMtGQWY
+-----END PRIVATE KEY-----

diff --git a/letsencrypt/keys/2222_key-certbot.pem b/letsencrypt/keys/2222_key-certbot.pem
new file mode 100644 (file)
index 0000000..53c8e13
--- /dev/null
+++ b/letsencrypt/keys/2222_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDGj8l1xG5N490r
+BZN4wkiWcL1O2N2Yd8rWhhStZCLTWgWazc0ucPA3pGCW4/K6GDoBDy93iOY/pDLO
+Msl5b6NpqIXZ6Dy8ncwn7ehlo6EEMpwrSFfYfvxhhPgC3oZ+3CJC+oV0E6fiHJ6E
+xM2qaXaBW3JG02EeqloMeESmTXaB2j1cWupWsogOl9XUTQu5DIconqMsWcU4E6w6
+24Cd7CJfXVFAZ1MXu4tx9rK9jTD2rjGyDeXHlge/3zj1keaLnz9BHKIcdfONKFkl
+VZAAyV+HDQLkJ6S58x7FE1UbcAaw2X/9l3/6tWX91byUUQbAKDK9OsPhBO0j712y
+k//GPTnBAgMBAAECggEAfmPAJMpoPAQzH9Noz5E7iycwGSRJyWdXIb4vIz9+O3It
+5x/g3xLclU54fROTyYjqQwpbeIcXqKLoBACn5jh9mB/BM7d0EcuPzErPhwLk1zsv
+1Q0zfYc3NwvgolLq4Y1V8bRthjmMv4zgCjsLftGqsSR4VUTvqQleUFmtuP3N1VDq
+Rl+t7zN6UdTGJ/SRp2eVQeD/G5J0gckPB9H0V9CaCFpzL46LSwbdz87ubhUE6T/z
+OwMusSCLQOVk/opYSeWq3B00m/fvskhXo8/lFwGayHhnxCIpWuhaYHDac0Lj4BN9
+IXltAHFDmBgqg5msgBv8GgfLjUkIRCOv5tptUUX6EQKBgQDqhrOSeEXMgjkusUGT
+T0idFqU77gtYsKRY81prld0L6okArCne712Q3+A5S0P5H6POwRCelZNZLbqbz2Ch
+QVDLHvOMLp+Vc2ojqAe58OEQMDOEYGQZ4EoXiV8geDK2vOkm8VM4Nk1BhopHMkHL
+iyFh7UpVqE2AP00r0CD843yaSwKBgQDYvhOeLZq/sE/gLfOTiaToUYMt36sWkG8Z
+cPuFchJEedvHpNkDxazXy7gtBo2J1l9dcv/rMQiFkZMQQAtgnAknKvjx1n1pWp7N
+NpAIorTGYRDrc2ETUxunkaXBGDKKoFxF+BLNlezw7wL63udwqM/Bbvq7BbRSq3bL
+rhnUydd0owKBgQCkLtjX2UtD+IZ/oaf+sKptDsVuRx+6Xy8u9m5+ktPE29Q9nElT
+wM8H9TLL6V0UsonC3HX+D0iwTcst+Of0+/zLtkdaA+nEfp/3hlKiYXeuFZB7Q9/Q
+HazA/XKTEJKwS2AN2zQfTiSXktCLNyvIiwY7wBsiDEj1V1t3KKVvZPJ+MQKBgBM2
+9qJFRLzNsqcbK8beowH9h/WfKJm9gDvvKj0wWbI8Y2GVma+d7K7M3q0PMakQmi+8
+rDd7h1fgCfuc0eVkr+MLCjrWWxPl9sIWnjpFwmT74fYdqnN+IKuAXAN8U666fLOv
+RGt5aSIK7mazMC1qqdBqOEwwO0ZA8S0paBzXMASlAoGAExERYS3ri6kxdSGmPlYD
+jLCPB99907sH69WNgrzHWwv6C3e3e6ourutlfPbf5Jhya4K1c09JPExoF1deuU2y
+SNKUOkuxAU61+ZGhnE8tReaMDLkXWAYnGt3B2/mh2H8jeHJLG/O8XZUv3zxxsjoD
+nw2UbzoOxQGhsx5uUSHhwbk=
+-----END PRIVATE KEY-----

diff --git a/myssl/dh2048.pem b/myssl/dh2048.pem
index 366940fc8d5959f5b9b45f20902f5bc6dd292d49..a1e093eeac1cc83fe294b7f409557ded4ca4a5fc 100644 (file)
--- a/myssl/dh2048.pem
+++ b/myssl/dh2048.pem
@@ -1,8 +1,8 @@
 -----BEGIN DH PARAMETERS-----
-MIIBCAKCAQEAvwcAuJSLQbqSS+OZF2utI0Ajueeokl1nURqt9tLpF1XSMGsG09Hb
-JzrY35C1mcfBIxR/bjv6hEGFJEwMOpCq1qsoWClba4kYzEVWBAt6UB2Ddm8/bONs
-oLOO5/LXfRSR3fY2D9AzCAUE44Sv6nj71EGGemdHksjnwm8/x6W9R9QSZz+6eGwS
-i7TCMs4Ppfzb5rhh8eqI/tPcQzSj22M+YRqsTx2Ukyu/VbaMuVr43RxlsGUB816M
-ATNziPXzUm9VEDp4s5ayohu2iS8dPggVKuydUetNDYEWm70Kquu/vNFhHxSYsbH6
-cN3Uuav9jTcwZxKBHbGkfuMLkG4miMAI4wIBAg==
+MIIBCAKCAQEAuQnyjc+C5bvITBBbnmt1RiNiJRzsM+2ng1UbVnWuUfdf49xHTdA8
+itCbrLcP28Elh+pxaoh13+QlErDOTEK4Wkbb+/WUH1kFPlNOCndit9J1nFXufh0c
+GBS3jalylyYLKAdjNU7XyjYxQb31s3G0C8UUf0a02VvG2jCS05x99HRHifMy07xD
+cq0GiKSGYvYkh7FhYIPPYuqep29xzkVdAyqs95bHRD21cymKKg4HW8TMPBymGbh8
+PvT6ZjTnmuYUadxLRUBBP088Ftk6W2nltdj5Xy7q2nhgKE3oqEgHUk6GwigZSenD
+LA7TyvT4iW3R9CfQgTsx2MfB4HRxSoZ4GwIBAg==
 -----END DH PARAMETERS-----