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

Merge branch 'dev' of https://gitlab.com/Shinobi-Systems/Shinobi into dev

auto-build-api-doc-with-code
Moe 2021-03-27 06:56:56 -07:00
parent f5edc26808 794dd20c10
commit 0d38d9ecaa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Docker/init.sh
View File

@ -69,7 +69,7 @@ if [ "$DB_DISABLE_INCLUDED" = "false" ]; then
else else
echo "Create database schema if it does not exists ..." echo "Create database schema if it does not exists ..."
mysql -u "$DB_USER" -h "$DB_HOST" -p"$DB_PASSWORD" --port="$DB_PORT" -e "source /home/Shinobi/sql/framework.sql" || true mysql -u "$DB_USER" -h "$DB_HOST" -p"$DB_PASSWORD" --port="$DB_PORT" --database="$DB_DATABASE" -e "source /home/Shinobi/sql/framework.sql" || true
fi fi
DATABASE_CONFIG='{"host": "'$DB_HOST'","user": "'$DB_USER'","password": "'$DB_PASSWORD'","database": "'$DB_DATABASE'","port":'$DB_PORT'}' DATABASE_CONFIG='{"host": "'$DB_HOST'","user": "'$DB_USER'","password": "'$DB_PASSWORD'","database": "'$DB_DATABASE'","port":'$DB_PORT'}'

2
INSTALL/shinobi
View File

@ -80,7 +80,7 @@ if [[ $@ == *'restart'* ]]; then
else else
if [[ $@ == *'start'* ]] || [[ $@ == *'now'* ]]; then if [[ $@ == *'start'* ]] || [[ $@ == *'now'* ]]; then
proccessAlive=$(pm2 list | grep camera | grep online) proccessAlive=$(pm2 list | grep camera | grep online)
if [ "$proccessAlive" ]]; then if [ "$proccessAlive" ]; then
echo "Shinobi process is already running." echo "Shinobi process is already running."
else else
if [ -e "$installationDirectory/INSTALL/installed.txt" ]; then if [ -e "$installationDirectory/INSTALL/installed.txt" ]; then