From 7cd5afd24ad9d22dbbd4d266698f940b8176e6b0 Mon Sep 17 00:00:00 2001 From: Mike Hurley Date: Sat, 27 Nov 2021 03:23:54 +0000 Subject: [PATCH 1/5] Fix case of repo powertools --- INSTALL/CentOS - Quick Install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL/CentOS - Quick Install.sh b/INSTALL/CentOS - Quick Install.sh index b45014a5..e6fd1d9f 100644 --- a/INSTALL/CentOS - Quick Install.sh +++ b/INSTALL/CentOS - Quick Install.sh @@ -125,7 +125,7 @@ if [ "${ffmpeginstall^}" = "Y" ]; then elif [ "$version" = 8 ]; then #Enable Negativo17 repo for FFMPEG (CentOS 8) sudo dnf install epel-release dnf-utils -y -q -e 0 - sudo yum-config-manager --set-enabled PowerTools + sudo yum-config-manager --set-enabled powertools sudo yum-config-manager --add-repo=https://negativo17.org/repos/epel-multimedia.repo sudo dnf install ffmpeg ffmpeg-devel -y -q -e 0 fi From 9e3861aec610e1b719216f8a8a9ec4500d3673e4 Mon Sep 17 00:00:00 2001 From: Mike Hurley Date: Sat, 27 Nov 2021 04:00:50 +0000 Subject: [PATCH 2/5] update to address mysql_secure_installation to mariadb-secure-installation change --- INSTALL/CentOS - Quick Install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL/CentOS - Quick Install.sh b/INSTALL/CentOS - Quick Install.sh index e6fd1d9f..614de9b9 100644 --- a/INSTALL/CentOS - Quick Install.sh +++ b/INSTALL/CentOS - Quick Install.sh @@ -148,7 +148,7 @@ if [ "${installdbserver^}" = "Y" ] || [ "${installdbserver^}" = "" ]; then if [ "${securedbserver^}" = "Y" ]; then #Configure basic security for MariaDB - sudo mysql_secure_installation + sudo mariadb-secure-installation else echo "=========================================================" echo "Skipping database server security configuration..." From 4ee189203701ae1f22baf6b796acd009749c5341 Mon Sep 17 00:00:00 2001 From: Mike Hurley Date: Sat, 27 Nov 2021 04:02:29 +0000 Subject: [PATCH 3/5] update to address mysql_secure_installation to mariadb-secure-installation change --- INSTALL/centos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL/centos.sh b/INSTALL/centos.sh index 4c8d7a77..15a61ea2 100644 --- a/INSTALL/centos.sh +++ b/INSTALL/centos.sh @@ -76,7 +76,7 @@ if [ "$mysqlagree" = "y" ] || [ "$mysqlagree" = "Y" ]; then sudo systemctl start mariadb sudo systemctl enable mariadb #Run mysql install - sudo mysql_secure_installation + sudo mariadb-secure-installation fi echo "=============" echo "Shinobi - Database Installation" From 71a536c0cd71480467a50552a5d25ffe1cf1395e Mon Sep 17 00:00:00 2001 From: Moe Date: Sat, 27 Nov 2021 19:12:54 -0800 Subject: [PATCH 4/5] cron syntax fix for file size setting after old video delete --- cron.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cron.js b/cron.js index ad9eb97b..59f6cc22 100644 --- a/cron.js +++ b/cron.js @@ -207,7 +207,7 @@ const deleteVideosByDays = async (v,days,addedQueries) => { const filename = formattedTime(row.time) + '.' + row.ext try{ await fs.promises.unlink(dir + filename) - row.size += clearSize + clearSize += row.size sendToWebSocket({ f: 'video_delete', filename: filename + '.' + row.ext, From b0b12d7261f089604e4a4e07af4dce0ef786531d Mon Sep 17 00:00:00 2001 From: Moe Date: Sun, 28 Nov 2021 09:26:02 -0800 Subject: [PATCH 5/5] cron syntax fix for file size setting after old video delete+ --- cron.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cron.js b/cron.js index 59f6cc22..bc738df5 100644 --- a/cron.js +++ b/cron.js @@ -207,7 +207,7 @@ const deleteVideosByDays = async (v,days,addedQueries) => { const filename = formattedTime(row.time) + '.' + row.ext try{ await fs.promises.unlink(dir + filename) - clearSize += row.size + clearSize += row.size / 1048576 sendToWebSocket({ f: 'video_delete', filename: filename + '.' + row.ext,