ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'cron-addstorage-fix' 

# Conflicts:
#   cron.js
cron-addstorage-fix
Moe 2021-11-29 21:58:29 +00:00
parent 26572e480b b0b12d7261
commit 85c965eef8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL/CentOS - Quick Install.sh
View File

@ -125,7 +125,7 @@ if [ "${ffmpeginstall^}" = "Y" ]; then
elif [ "$version" = 8 ]; then elif [ "$version" = 8 ]; then
#Enable Negativo17 repo for FFMPEG (CentOS 8) #Enable Negativo17 repo for FFMPEG (CentOS 8)
sudo dnf install epel-release dnf-utils -y -q -e 0 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 yum-config-manager --add-repo=https://negativo17.org/repos/epel-multimedia.repo
sudo dnf install ffmpeg ffmpeg-devel -y -q -e 0 sudo dnf install ffmpeg ffmpeg-devel -y -q -e 0
fi fi
@ -148,7 +148,7 @@ if [ "${installdbserver^}" = "Y" ] || [ "${installdbserver^}" = "" ]; then
if [ "${securedbserver^}" = "Y" ]; then if [ "${securedbserver^}" = "Y" ]; then
#Configure basic security for MariaDB #Configure basic security for MariaDB
sudo mysql_secure_installation sudo mariadb-secure-installation
else else
echo "=========================================================" echo "========================================================="
echo "Skipping database server security configuration..." echo "Skipping database server security configuration..."

2
INSTALL/centos.sh
View File

@ -76,7 +76,7 @@ if [ "$mysqlagree" = "y" ] || [ "$mysqlagree" = "Y" ]; then
sudo systemctl start mariadb sudo systemctl start mariadb
sudo systemctl enable mariadb sudo systemctl enable mariadb
#Run mysql install #Run mysql install
sudo mysql_secure_installation sudo mariadb-secure-installation
fi fi
echo "=============" echo "============="
echo "Shinobi - Database Installation" echo "Shinobi - Database Installation"