From 0c2bcb375576a8337a7c7319f51799b92f07b557 Mon Sep 17 00:00:00 2001
From: bms8197 <bogdan@898.ro>
Date: Mon, 23 May 2022 13:03:33 +0300
Subject: [PATCH] saving uncommitted changes in /etc prior to dnf run

---
 .etckeeper                                 |  3 ++-
 csf/csf.ignore                             | 11 ++++-----
 letsencrypt/csr/0415_csr-certbot.pem       | 16 +++++++++++++
 letsencrypt/keys/0415_key-certbot.pem      | 28 ++++++++++++++++++++++
 letsencrypt/renewal/golinks.club3d.ro.conf | 14 -----------
 5 files changed, 50 insertions(+), 22 deletions(-)
 create mode 100644 letsencrypt/csr/0415_csr-certbot.pem
 create mode 100644 letsencrypt/keys/0415_key-certbot.pem
 delete mode 100644 letsencrypt/renewal/golinks.club3d.ro.conf

diff --git a/.etckeeper b/.etckeeper
index f6a2b62..2a9275b 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -2125,6 +2125,7 @@ maybe chmod 0640 'letsencrypt/csr/0411_csr-certbot.pem'
 maybe chmod 0640 'letsencrypt/csr/0412_csr-certbot.pem'
 maybe chmod 0640 'letsencrypt/csr/0413_csr-certbot.pem'
 maybe chmod 0640 'letsencrypt/csr/0414_csr-certbot.pem'
+maybe chmod 0640 'letsencrypt/csr/0415_csr-certbot.pem'
 maybe chown 'setroubleshoot' 'letsencrypt/keys'
 maybe chgrp 'setroubleshoot' 'letsencrypt/keys'
 maybe chmod 0700 'letsencrypt/keys'
@@ -2575,6 +2576,7 @@ maybe chmod 0600 'letsencrypt/keys/0411_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0412_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0413_key-certbot.pem'
 maybe chmod 0600 'letsencrypt/keys/0414_key-certbot.pem'
+maybe chmod 0600 'letsencrypt/keys/0415_key-certbot.pem'
 maybe chown 'setroubleshoot' 'letsencrypt/live'
 maybe chgrp 'setroubleshoot' 'letsencrypt/live'
 maybe chmod 0700 'letsencrypt/live'
@@ -2639,7 +2641,6 @@ maybe chmod 0755 'letsencrypt/renewal-hooks/pre'
 maybe chmod 0640 'letsencrypt/renewal/club3d.ro-0001.conf'
 maybe chmod 0640 'letsencrypt/renewal/files.898.ro.conf'
 maybe chmod 0640 'letsencrypt/renewal/git.898.ro.conf'
-maybe chmod 0640 'letsencrypt/renewal/golinks.club3d.ro.conf'
 maybe chmod 0644 'letsencrypt/renewal/mail.898.ro.conf'
 maybe chmod 0640 'letsencrypt/renewal/mail.anywhere.ro.conf'
 maybe chmod 0640 'letsencrypt/renewal/mail.club3d.ro.conf'
diff --git a/csf/csf.ignore b/csf/csf.ignore
index 4bf8c74..4677587 100644
--- a/csf/csf.ignore
+++ b/csf/csf.ignore
@@ -19,11 +19,8 @@
 192.168.1.0/24
 
 # RDS
-188.25.150.232
-79.117.167.213
-188.26.225.44
-86.121.175.127
-188.25.218.186
-86.126.20.95
 86.126.27.87
-86.127.4.94
+
+# RND
+82.76.35.228
+
diff --git a/letsencrypt/csr/0415_csr-certbot.pem b/letsencrypt/csr/0415_csr-certbot.pem
new file mode 100644
index 0000000..ff9833b
--- /dev/null
+++ b/letsencrypt/csr/0415_csr-certbot.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICdDCCAVwCAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO5A
+NNphKu54Jy3mkOZpanwskVTuB33OOjJLe6M463zY5V0lTZEk4YcQxkOH+JrAinAy
+OucUuPQ716GTmEW5r6X7OP6/mQhvf/UZKpfFHXG04O3/Wj1AfS/XnSEdza5EI8GT
+UK1L8L/KqVm5cbdSD8oO1ACt1633HTkHKHnJHKp+9U2J8QX2RJaZt2aHvTo4eKeM
+PER4n5eRhw4mLSeQvCi8ct2sjDfAhWmy7YKHY093A+yY16XGrHF/qMttNqilLxOc
+IJwJayPCjpZTHMK8l7hlAHa8qiEUtwxkMOl45UoV4xCAGkHMN32qtvJpcdhhwF85
+Hz9uBMh9IZ6fq+2z9QMCAwEAAaAvMC0GCSqGSIb3DQEJDjEgMB4wHAYDVR0RBBUw
+E4IRZ29saW5rcy5jbHViM2Qucm8wDQYJKoZIhvcNAQELBQADggEBADIN6Oge7jiw
+Q/QAu954vP+6GyuVS7Raee2HTZv+4GV/nyOgeeVhfw0GDS/BBBKkQ0xIoN7EQ8l5
+sEw1ASw5bN3Ke+kt4B/R5v8DqJuhtd6u6q1NpyV7t/RmmSb+VqnzTvzKrZN2MnA0
+Ztheausu23aDRWXIQ8J8p4CiShoDYOWkdm8UH58wpzgIctTgWV1iVXUpNOVR4a06
+WqrOzuK7cm5L2ofj/IQgoAb6OzVvJpcWHQ2snApx39TqGSb7lW1mCpmd1Z+IEjFV
+6Zmc1WqnOsn9HgGAQncq8a26cAKfsGrhzz/ZwHL+BblD9vTf5mJO/oqZjtZt0OQg
+wE29r/zgUDQ=
+-----END CERTIFICATE REQUEST-----
diff --git a/letsencrypt/keys/0415_key-certbot.pem b/letsencrypt/keys/0415_key-certbot.pem
new file mode 100644
index 0000000..571b5a4
--- /dev/null
+++ b/letsencrypt/keys/0415_key-certbot.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDuQDTaYSrueCct
+5pDmaWp8LJFU7gd9zjoyS3ujOOt82OVdJU2RJOGHEMZDh/iawIpwMjrnFLj0O9eh
+k5hFua+l+zj+v5kIb3/1GSqXxR1xtODt/1o9QH0v150hHc2uRCPBk1CtS/C/yqlZ
+uXG3Ug/KDtQArdet9x05Byh5yRyqfvVNifEF9kSWmbdmh706OHinjDxEeJ+XkYcO
+Ji0nkLwovHLdrIw3wIVpsu2Ch2NPdwPsmNelxqxxf6jLbTaopS8TnCCcCWsjwo6W
+UxzCvJe4ZQB2vKohFLcMZDDpeOVKFeMQgBpBzDd9qrbyaXHYYcBfOR8/bgTIfSGe
+n6vts/UDAgMBAAECggEAchTSegLvALMN55+woHO3pm/cwzMa6TWXjj+wmw6FTAm7
+gid7hdWIHBl/JhT0iH1LjL+wjrfQfDovXVIEJtbr8Wli+DCcQXrKZX1AdN3Q5IJ8
+9dlAx3WavA7dUV8o/pnoGSfGCMUFKYEMKEdw2Rv1LYZ+IzkavlVGa+kui2ouTMCD
+flQG3pMMd/U6pCzUCXW4dlhja83pkbHNZYVdUTBrPHYoWUwPSrhgimrhgHUXu1ho
+QdlSUq4Hi2y5DAF9fs/e73etffsqYrJEcqUbzqO8X6HUNvrZz2gDwK2sAQyznAEv
+aH63HIk5aMpDhbpJq1m1D3EYXbjRpYspOkMEOM7O0QKBgQD7bOmVvMa/fmvge/B9
+ov8ANxR8sec/ygyQGZOH96W6dVVBfXNSQU1bq9YN1hEbC2+aFkfaKwLvrLFdTL+g
+Rz7CuFjRu78o/4CSagTJiwvhkiYZRrgwhy4iwQsC/h0t5qP7HmHTeq9QmQNvmKJF
+hkyKRTTU44+VkU14vr2MC1qOKQKBgQDyle3nLduPN93OfG6jGvuvFGqVYw/wglWE
+pUXVLM3KQuderCUWkVpYSq//kWO88XZz2D67SYFB8wivQkHLVqUmkmeYJv0GhHMB
+DVnIeMCirHj4uGH9VuTZONv78mrLdYQipuTn5oaejLcJe2PEXmPRCqNWKBLQC7Tn
+JdOI0cW3SwKBgHyMYlYD0uyvop7spqCGKw4fOu3ebzDBVWHY2aWEPzvTve0YSRVZ
+NgoQYJQwE/8ythE9slBX+Ddkc+RFDbRHNsbc7VrQR4z2rOlazY5NbBBNBsSErN+V
+R3x95oeP/EJtu5O9ZDaP0uL5OaOBl/ka4zWnvNks9UbhWOBUlK8YPL6pAoGBAKtu
+fOOEqsa5akyD7wPhC8Aco33Ste73jEvjKEiQExY+1Zc3/DXInpoKnfnz2xIpadZQ
+GXTtayUaBScloa17G9b4W7FQzDsQ2t0BfFOJ0kijrhHG66jHAY7o+b1BAWurLqf2
+XYnshXICa0+OHWEme0+9PtSiGTlhLIS1XJox9JGlAoGAXhTMEL6wph81vRm1lOeB
+d1dE+Mtsl9bYnPfp+DgSYcMYgG29pCFEjsChw3DALyXDY97S5VMPwkCsHkry9S8a
+XFHmppodTG1IbKyekuRMt5WE/4lBcX+D+Tu42dCLhlaCRprgcNfCNmXPoTSjrDpg
+Mphr9qcqXtrarsvrQ/NXmqw=
+-----END PRIVATE KEY-----
diff --git a/letsencrypt/renewal/golinks.club3d.ro.conf b/letsencrypt/renewal/golinks.club3d.ro.conf
deleted file mode 100644
index a91caa7..0000000
--- a/letsencrypt/renewal/golinks.club3d.ro.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-# renew_before_expiry = 30 days
-version = 1.22.0
-archive_dir = /etc/letsencrypt/archive/golinks.club3d.ro
-cert = /etc/letsencrypt/live/golinks.club3d.ro/cert.pem
-privkey = /etc/letsencrypt/live/golinks.club3d.ro/privkey.pem
-chain = /etc/letsencrypt/live/golinks.club3d.ro/chain.pem
-fullchain = /etc/letsencrypt/live/golinks.club3d.ro/fullchain.pem
-
-# Options used in the renewal process
-[renewalparams]
-account = 995d0d90943dc1603856ca5d83fcd7e0
-authenticator = nginx
-installer = nginx
-server = https://acme-v02.api.letsencrypt.org/directory