From e00385962364b4236fde926394c81c4131b86797 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Tue, 7 Dec 2021 02:01:31 +0100
Subject: [PATCH] daily autocommit

---
 .etckeeper                                    |  7 -----
 .../ignore.d.paranoid/mariadb-server-10_5     |  9 ------
 logcheck/ignore.d.server/mariadb-server-10_5  | 30 -------------------
 .../ignore.d.workstation/mariadb-server-10_5  | 30 -------------------
 luarocks/config-5.1.lua                       |  4 ---
 luarocks/config.lua                           |  4 ---
 myssl/dh4096.pem                              | 22 +++++++-------
 rc0.d/K01mariadb                              |  1 -
 rc1.d/K01mariadb                              |  1 -
 rc2.d/S02mariadb                              |  1 -
 rc3.d/S02mariadb                              |  1 -
 rc4.d/S02mariadb                              |  1 -
 rc5.d/S02mariadb                              |  1 -
 rc6.d/K01mariadb                              |  1 -
 ssl/certs/lets-encrypt-r3-cross-signed.pem    | 26 ----------------
 .../multi-user.target.wants/mariadb.service   |  1 -
 16 files changed, 11 insertions(+), 129 deletions(-)
 delete mode 100644 logcheck/ignore.d.paranoid/mariadb-server-10_5
 delete mode 100644 logcheck/ignore.d.server/mariadb-server-10_5
 delete mode 100644 logcheck/ignore.d.workstation/mariadb-server-10_5
 delete mode 100644 luarocks/config-5.1.lua
 delete mode 100644 luarocks/config.lua
 delete mode 120000 rc0.d/K01mariadb
 delete mode 120000 rc1.d/K01mariadb
 delete mode 120000 rc2.d/S02mariadb
 delete mode 120000 rc3.d/S02mariadb
 delete mode 120000 rc4.d/S02mariadb
 delete mode 120000 rc5.d/S02mariadb
 delete mode 120000 rc6.d/K01mariadb
 delete mode 100644 ssl/certs/lets-encrypt-r3-cross-signed.pem
 delete mode 120000 systemd/system/multi-user.target.wants/mariadb.service

diff --git a/.etckeeper b/.etckeeper
index 28eb6cde..ab2ecfa5 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -3353,7 +3353,6 @@ maybe chgrp 'logcheck' 'logcheck/ignore.d.paranoid/incron'
 maybe chmod 0644 'logcheck/ignore.d.paranoid/incron'
 maybe chgrp 'logcheck' 'logcheck/ignore.d.paranoid/logcheck'
 maybe chmod 0644 'logcheck/ignore.d.paranoid/logcheck'
-maybe chmod 0644 'logcheck/ignore.d.paranoid/mariadb-server-10_5'
 maybe chmod 0644 'logcheck/ignore.d.paranoid/mariadb-server-10_6'
 maybe chgrp 'logcheck' 'logcheck/ignore.d.paranoid/postfix'
 maybe chmod 0644 'logcheck/ignore.d.paranoid/postfix'
@@ -3504,7 +3503,6 @@ maybe chgrp 'logcheck' 'logcheck/ignore.d.server/login'
 maybe chmod 0644 'logcheck/ignore.d.server/login'
 maybe chgrp 'logcheck' 'logcheck/ignore.d.server/maradns'
 maybe chmod 0644 'logcheck/ignore.d.server/maradns'
-maybe chmod 0644 'logcheck/ignore.d.server/mariadb-server-10_5'
 maybe chmod 0644 'logcheck/ignore.d.server/mariadb-server-10_6'
 maybe chgrp 'logcheck' 'logcheck/ignore.d.server/mldonkey-server'
 maybe chmod 0644 'logcheck/ignore.d.server/mldonkey-server'
@@ -3684,7 +3682,6 @@ maybe chgrp 'logcheck' 'logcheck/ignore.d.workstation/logcheck'
 maybe chmod 0644 'logcheck/ignore.d.workstation/logcheck'
 maybe chgrp 'logcheck' 'logcheck/ignore.d.workstation/login'
 maybe chmod 0644 'logcheck/ignore.d.workstation/login'
-maybe chmod 0644 'logcheck/ignore.d.workstation/mariadb-server-10_5'
 maybe chmod 0644 'logcheck/ignore.d.workstation/mariadb-server-10_6'
 maybe chgrp 'logcheck' 'logcheck/ignore.d.workstation/net-acct'
 maybe chmod 0644 'logcheck/ignore.d.workstation/net-acct'
@@ -3768,9 +3765,6 @@ maybe chmod 0755 'logwatch/conf/logfiles'
 maybe chmod 0755 'logwatch/conf/services'
 maybe chmod 0755 'logwatch/scripts'
 maybe chmod 0755 'logwatch/scripts/services'
-maybe chmod 0755 'luarocks'
-maybe chmod 0644 'luarocks/config-5.1.lua'
-maybe chmod 0644 'luarocks/config.lua'
 maybe chmod 0755 'lynx'
 maybe chmod 0644 'lynx/lynx.cfg'
 maybe chmod 0644 'lynx/lynx.lss'
@@ -4553,7 +4547,6 @@ maybe chmod 0600 'ssl/certs/isrg-root-ocsp-x1.pem'
 maybe chmod 0600 'ssl/certs/isrg-root-x2.pem'
 maybe chmod 0600 'ssl/certs/isrgrootx1.pem'
 maybe chmod 0600 'ssl/certs/lets-encrypt-e1.pem'
-maybe chmod 0600 'ssl/certs/lets-encrypt-r3-cross-signed.pem'
 maybe chmod 0600 'ssl/certs/lets-encrypt-r3.pem'
 maybe chown 'caelebfi' 'ssl/certs/securesyslog.crt'
 maybe chgrp 'caelebfi' 'ssl/certs/securesyslog.crt'
diff --git a/logcheck/ignore.d.paranoid/mariadb-server-10_5 b/logcheck/ignore.d.paranoid/mariadb-server-10_5
deleted file mode 100644
index 407d4063..00000000
--- a/logcheck/ignore.d.paranoid/mariadb-server-10_5
+++ /dev/null
@@ -1,9 +0,0 @@
-/etc/init.d/mariadb\[[0-9]+\]: Check that mariadbd is running and that the socket: '/run/mysqld/mysqld.sock' exists\!$
-/etc/init.d/mariadb\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
-/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
-mariadbd\[[0-9]+\]: $
-mariadbd\[[0-9]+\]: Version: .* socket: '/run/mysqld/mysqld.sock'  port: 3306$
-mariadbd\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$
-mysqld_safe\[[0-9]+\]: started$
-usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$
-usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$
diff --git a/logcheck/ignore.d.server/mariadb-server-10_5 b/logcheck/ignore.d.server/mariadb-server-10_5
deleted file mode 100644
index a64fc54e..00000000
--- a/logcheck/ignore.d.server/mariadb-server-10_5
+++ /dev/null
@@ -1,30 +0,0 @@
-/etc/init.d/mariadb\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
-/etc/init.d/mariadb\[[0-9]+\]: Check that mariadbd is running and that the socket: '/run/mysqld/mysqld.sock' exists\!$
-/etc/init.d/mariadb\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
-/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
-mariadbd\[[0-9]+\]: ?$
-mariadbd\[[0-9]+\]: .*InnoDB: Shutdown completed
-mariadbd\[[0-9]+\]: .*InnoDB: Started;
-mariadbd\[[0-9]+\]: .*InnoDB: Starting shutdown\.\.\.$
-mariadbd\[[0-9]+\]: .*\[Note\] /usr/sbin/mariadbd: Normal shutdown$
-mariadbd\[[0-9]+\]: .*\[Note\] /usr/sbin/mariadbd: ready for connections\.$
-mariadbd\[[0-9]+\]: .*\[Note\] /usr/sbin/mariadbd: Shutdown complete$
-mariadbd\[[0-9]+\]: /usr/sbin/mariadbd: ready for connections\.$
-mariadbd\[[0-9]+\]: .*/usr/sbin/mariadbd: Shutdown Complete$
-mariadbd\[[0-9]+\]: Version: .* socket
-mariadbd\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$
-mysqld_safe\[[0-9]+\]: ?$
-mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$
-mysqld_safe\[[0-9]+\]: ended$
-mysqld_safe\[[0-9]+\]: NOTE:  If you are upgrading from a MySQL <= 3.22.10 you should run$
-mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$
-mysqld_safe\[[0-9]+\]: Please report any problems at https://mariadb.org/jira$
-mysqld_safe\[[0-9]+\]: See the manual for more instructions.$
-mysqld_safe\[[0-9]+\]: started$
-mysqld_safe\[[0-9]+\]: The latest information about MariaDB is available at$
-mysqld_safe\[[0-9]+\]: the /usr/bin/mysql_fix_privilege_tables. Otherwise you will not be$
-mysqld_safe\[[0-9]+\]: To do so, start the server, then issue the following commands:$
-mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root -h app109 password 'new-password'$
-mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root password 'new-password'$
-usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$
-usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$
diff --git a/logcheck/ignore.d.workstation/mariadb-server-10_5 b/logcheck/ignore.d.workstation/mariadb-server-10_5
deleted file mode 100644
index a64fc54e..00000000
--- a/logcheck/ignore.d.workstation/mariadb-server-10_5
+++ /dev/null
@@ -1,30 +0,0 @@
-/etc/init.d/mariadb\[[0-9]+\]: [0-9]+ processes alive and '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
-/etc/init.d/mariadb\[[0-9]+\]: Check that mariadbd is running and that the socket: '/run/mysqld/mysqld.sock' exists\!$
-/etc/init.d/mariadb\[[0-9]+\]: '/usr/bin/mysqladmin --defaults-(extra-)?file=/etc/mysql/debian.cnf ping' resulted in$
-/etc/mysql/debian-start\[[0-9]+\]: Checking for crashed MySQL tables\.$
-mariadbd\[[0-9]+\]: ?$
-mariadbd\[[0-9]+\]: .*InnoDB: Shutdown completed
-mariadbd\[[0-9]+\]: .*InnoDB: Started;
-mariadbd\[[0-9]+\]: .*InnoDB: Starting shutdown\.\.\.$
-mariadbd\[[0-9]+\]: .*\[Note\] /usr/sbin/mariadbd: Normal shutdown$
-mariadbd\[[0-9]+\]: .*\[Note\] /usr/sbin/mariadbd: ready for connections\.$
-mariadbd\[[0-9]+\]: .*\[Note\] /usr/sbin/mariadbd: Shutdown complete$
-mariadbd\[[0-9]+\]: /usr/sbin/mariadbd: ready for connections\.$
-mariadbd\[[0-9]+\]: .*/usr/sbin/mariadbd: Shutdown Complete$
-mariadbd\[[0-9]+\]: Version: .* socket
-mariadbd\[[0-9]+\]: Warning: Ignoring user change to 'mysql' because the user was set to 'mysql' earlier on the command line$
-mysqld_safe\[[0-9]+\]: ?$
-mysqld_safe\[[0-9]+\]: able to use the new GRANT command!$
-mysqld_safe\[[0-9]+\]: ended$
-mysqld_safe\[[0-9]+\]: NOTE:  If you are upgrading from a MySQL <= 3.22.10 you should run$
-mysqld_safe\[[0-9]+\]: PLEASE REMEMBER TO SET A PASSWORD FOR THE MySQL root USER !$
-mysqld_safe\[[0-9]+\]: Please report any problems at https://mariadb.org/jira$
-mysqld_safe\[[0-9]+\]: See the manual for more instructions.$
-mysqld_safe\[[0-9]+\]: started$
-mysqld_safe\[[0-9]+\]: The latest information about MariaDB is available at$
-mysqld_safe\[[0-9]+\]: the /usr/bin/mysql_fix_privilege_tables. Otherwise you will not be$
-mysqld_safe\[[0-9]+\]: To do so, start the server, then issue the following commands:$
-mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root -h app109 password 'new-password'$
-mysqld_safe\[[0-9]+\]: /usr/bin/mysqladmin -u root password 'new-password'$
-usermod\[[0-9]+\]: change user `mysql' GID from `([0-9]+)' to `\1'$
-usermod\[[0-9]+\]: change user `mysql' shell from `/bin/false' to `/bin/false'$
diff --git a/luarocks/config-5.1.lua b/luarocks/config-5.1.lua
deleted file mode 100644
index ac9306d1..00000000
--- a/luarocks/config-5.1.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-rocks_trees = {
-   home..[[/.luarocks]],
-   [[/usr/local]]
-}
diff --git a/luarocks/config.lua b/luarocks/config.lua
deleted file mode 100644
index ac9306d1..00000000
--- a/luarocks/config.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-rocks_trees = {
-   home..[[/.luarocks]],
-   [[/usr/local]]
-}
diff --git a/myssl/dh4096.pem b/myssl/dh4096.pem
index cc1e862e..55e6a717 100644
--- a/myssl/dh4096.pem
+++ b/myssl/dh4096.pem
@@ -1,13 +1,13 @@
 -----BEGIN DH PARAMETERS-----
-MIICCAKCAgEA+pj3izTxPnAiKXl8+EPD3L1Mvu7TuWMFe6dsSuIAwX7HSCmEUQQ2
-mhv0AvRWTLNe4JLm/daiPLw7i/CqHqGbs9ivF8WNZnOElSjh7MTk7CGJLnZtMBge
-MWfxhFb1mMUtNKzr9ka9XOSZk8SCtCaeFYhE1fhBHXTm2+XOQQaM/LbRQH+vt3k0
-zqNqVLkLIs/Gd/1yPYRNN+3iiOdnu+ID/GLT4vcIeiQDgCE+N9tFpDPmB5d8s/wf
-UshOFxO/fu4WLdU/5iKg21cOmC+93QsRN9/ILeRdEhnr0ReQJAoCW5QL7q/9csVb
-pFprxNvH4dGkeTB8fkgfZrkfAAnwx8eZpsc23VfeTkfKnLANIn6H46lPfPQLpRJL
-B+DZt+QMsv5EvG9wdrCnnRHJ9+IHJFvfloh9JS8YkK0DNJB/xttTX5cba+2sdGTY
-EokUGCzLprgIQVhapcT8eZyw+aMlHGMA+7Gzkd3SJ2D8uLo9h62DFyWRmwdhNyKK
-cj/izdXKaWP68iXAZXsS2/HeXuCJ0mLj0P0B5S/n1LBL/0ciWEw2QQRZ2WYN5JC5
-DZIxR49h7LJUWanhFgqHHMKOFMKh3gqBuaAACPZlW5xqorkbBvep9yr12V97uzNi
-O+/oPQozm1tD675brcV5DLusBThvXsPj//8lG/Yyw72aF/1vXjv18hsCAQI=
+MIICCAKCAgEAmSFAypGnc3nefPG2xyvW5kKSY9X1A4XFB//oxkAtnC09uDfOoZS8
+/el4Fn4dxwWvcYKDFbCpYic/Z1QoxhxLSxOHeiHQvhJ8sgv9XMQIXYp0ESTi4PxZ
+5thhDK49sgACFs/eDymm4jHBAUjY7pmNqY50aR9K4b6jrefO06PgUwicT6Jdo/eP
+qclrl0yaclc6s/QiVDhETCVN4L6AijcBVrUw6aXd0GeUYRl7sHroJMIpx1TJ+8rH
+YYOtlBrAW1CwNRChy4FCovLnoSigUqeZUOlrkuHRRI9l0EmoQxCtrwQZgLM1x2dN
+ASZ22amO/gZlX4ujccxMdIUxxovDkSQUIVxsk5aP+0rSPHIILQ/M693nF1KZ54/v
+epQCxBz1EF4VASw9ucVHrQ0HuUH3JGe/w4tet8abk2SJfbZ4SsAEa5jGh7eUYZ0G
+AlcROl2B9kHz+12JgPNRr6YXwgHc9ZPk0lZiCIBs8XUHoV5TmXXkoz34XcLb2OU0
++TqYcBnEIKvbuMN/dyMROX9S4TjJU0hDhxMkUMjH9vJpWlppKZoOelFv7bKqwsf+
+GiLxlwemPcgGQji34/LyTfnDkpi/NRhiHpZoYKPylRt9Eo+JEQ3vwsXCwX1ejWYk
+LsCLYv5+vpCdvuVyh82HRolrGlk4FPTOETxFAoe7YTxa8hFTe2l1nNsCAQI=
 -----END DH PARAMETERS-----
diff --git a/rc0.d/K01mariadb b/rc0.d/K01mariadb
deleted file mode 120000
index 5d255e0b..00000000
--- a/rc0.d/K01mariadb
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mariadb
\ No newline at end of file
diff --git a/rc1.d/K01mariadb b/rc1.d/K01mariadb
deleted file mode 120000
index 5d255e0b..00000000
--- a/rc1.d/K01mariadb
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mariadb
\ No newline at end of file
diff --git a/rc2.d/S02mariadb b/rc2.d/S02mariadb
deleted file mode 120000
index 5d255e0b..00000000
--- a/rc2.d/S02mariadb
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mariadb
\ No newline at end of file
diff --git a/rc3.d/S02mariadb b/rc3.d/S02mariadb
deleted file mode 120000
index 5d255e0b..00000000
--- a/rc3.d/S02mariadb
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mariadb
\ No newline at end of file
diff --git a/rc4.d/S02mariadb b/rc4.d/S02mariadb
deleted file mode 120000
index 5d255e0b..00000000
--- a/rc4.d/S02mariadb
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mariadb
\ No newline at end of file
diff --git a/rc5.d/S02mariadb b/rc5.d/S02mariadb
deleted file mode 120000
index 5d255e0b..00000000
--- a/rc5.d/S02mariadb
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mariadb
\ No newline at end of file
diff --git a/rc6.d/K01mariadb b/rc6.d/K01mariadb
deleted file mode 120000
index 5d255e0b..00000000
--- a/rc6.d/K01mariadb
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/mariadb
\ No newline at end of file
diff --git a/ssl/certs/lets-encrypt-r3-cross-signed.pem b/ssl/certs/lets-encrypt-r3-cross-signed.pem
deleted file mode 100644
index 1d82449a..00000000
--- a/ssl/certs/lets-encrypt-r3-cross-signed.pem
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEZTCCA02gAwIBAgIQQAF1BIMUpMghjISpDBbN3zANBgkqhkiG9w0BAQsFADA/
-MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTIwMTAwNzE5MjE0MFoXDTIxMDkyOTE5MjE0MFow
-MjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxCzAJBgNVBAMT
-AlIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwIVKMz2oJTTDxLs
-jVWSw/iC8ZmmekKIp10mqrUrucVMsa+Oa/l1yKPXD0eUFFU1V4yeqKI5GfWCPEKp
-Tm71O8Mu243AsFzzWTjn7c9p8FoLG77AlCQlh/o3cbMT5xys4Zvv2+Q7RVJFlqnB
-U840yFLuta7tj95gcOKlVKu2bQ6XpUA0ayvTvGbrZjR8+muLj1cpmfgwF126cm/7
-gcWt0oZYPRfH5wm78Sv3htzB2nFd1EbjzK0lwYi8YGd1ZrPxGPeiXOZT/zqItkel
-/xMY6pgJdz+dU/nPAeX1pnAXFK9jpP+Zs5Od3FOnBv5IhR2haa4ldbsTzFID9e1R
-oYvbFQIDAQABo4IBaDCCAWQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8E
-BAMCAYYwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5p
-ZGVudHJ1c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTE
-p7Gkeyxx+tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEE
-AYLfEwEBATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2Vu
-Y3J5cHQub3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0
-LmNvbS9EU1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYf
-r52LFMLGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B
-AQsFAAOCAQEA2UzgyfWEiDcx27sT4rP8i2tiEmxYt0l+PAK3qB8oYevO4C5z70kH
-ejWEHx2taPDY/laBL21/WKZuNTYQHHPD5b1tXgHXbnL7KqC401dk5VvCadTQsvd8
-S8MXjohyc9z9/G2948kLjmE6Flh9dDYrVYA9x2O+hEPGOaEOa1eePynBgPayvUfL
-qjBstzLhWVQLGAkXXmNs+5ZnPBxzDJOLxhF2JIbeQAcH5H0tZrUlo5ZYyOqA7s9p
-O5b85o3AM/OJ+CktFBQtfvBhcJVd9wvlwPsk+uyOy2HI7mNxKKgsBTt375teA2Tw
-UdHkhVNcsAKX1H7GNNLOEADksd86wuoXvg==
------END CERTIFICATE-----
diff --git a/systemd/system/multi-user.target.wants/mariadb.service b/systemd/system/multi-user.target.wants/mariadb.service
deleted file mode 120000
index fd9e114a..00000000
--- a/systemd/system/multi-user.target.wants/mariadb.service
+++ /dev/null
@@ -1 +0,0 @@
-/lib/systemd/system/mariadb.service
\ No newline at end of file