Merge branch 'hotfix/v2.5.1' into develop
This commit is contained in:
commit
0af8141025
@ -127,7 +127,7 @@
|
|||||||
"url": "/socket.io",
|
"url": "/socket.io",
|
||||||
"internal": "http://localhost:9899/"
|
"internal": "http://localhost:9899/"
|
||||||
},
|
},
|
||||||
"cultures": "az,bg,cs,de,el-GR,en-GB,en-US,es,fi,fr,hy-AM,it,lv,nl,pl,pt,pt-BR,ro,ru,sk,sl,sr-Latn-RS,vi,tr,uk-UA,ar-SA,lo-LA,ja-JP,zh-CN,ko-KR",
|
"cultures": "az,cs,de,en-GB,en-US,es,fr,it,lv,nl,pl,pt-BR,pt,ro,sk,sl,fi,vi,tr,el-GR,bg,ru,sr-Latn-RS,uk-UA,hy-AM,ar-SA,si,lo-LA,zh-CN,ja-JP,ko-KR",
|
||||||
"controlpanel": {
|
"controlpanel": {
|
||||||
"url": ""
|
"url": ""
|
||||||
},
|
},
|
||||||
|
@ -346,7 +346,7 @@ establish_mysql_conn(){
|
|||||||
$MYSQL -e ";" >/dev/null 2>&1
|
$MYSQL -e ";" >/dev/null 2>&1
|
||||||
ERRCODE=$?
|
ERRCODE=$?
|
||||||
if [ $ERRCODE -ne 0 ]; then
|
if [ $ERRCODE -ne 0 ]; then
|
||||||
systemctl ${MYSQL_PACKAGE} start >/dev/null 2>&1
|
systemctl start ${MYSQL_PACKAGE} >/dev/null 2>&1
|
||||||
$MYSQL -e ";" >/dev/null 2>&1 || { echo "FAILURE"; exit 1; }
|
$MYSQL -e ";" >/dev/null 2>&1 || { echo "FAILURE"; exit 1; }
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user