mirror of
https://github.com/Ysurac/openmptcprouter-vps.git
synced 2025-03-09 15:50:00 +00:00
Fix get previous pass for omr-admin
This commit is contained in:
parent
8e795b035b
commit
5bfd42770d
1 changed files with 2 additions and 2 deletions
|
@ -450,9 +450,9 @@ if [ "$OMR_ADMIN" = "yes" ]; then
|
||||||
if [ -f /etc/openmptcprouter-vps-admin/omr-admin-config.json ]; then
|
if [ -f /etc/openmptcprouter-vps-admin/omr-admin-config.json ]; then
|
||||||
OMR_ADMIN_PASS2=$(grep -Po '"'"pass"'"\s*:\s*"\K([^"]*)' /etc/openmptcprouter-vps-admin/omr-admin-config.json | tr -d "\n")
|
OMR_ADMIN_PASS2=$(grep -Po '"'"pass"'"\s*:\s*"\K([^"]*)' /etc/openmptcprouter-vps-admin/omr-admin-config.json | tr -d "\n")
|
||||||
[ -z "$OMR_ADMIN_PASS2" ] && OMR_ADMIN_PASS2=$(cat /etc/openmptcprouter-vps-admin/omr-admin-config.json | jq -r .users[0].openmptcprouter.user_password | tr -d "\n")
|
[ -z "$OMR_ADMIN_PASS2" ] && OMR_ADMIN_PASS2=$(cat /etc/openmptcprouter-vps-admin/omr-admin-config.json | jq -r .users[0].openmptcprouter.user_password | tr -d "\n")
|
||||||
[ -n "$OMR_ADMIN_PASS2" ] && OMR_ADMIN_PASS=$OMR_ADMIN_PASS2
|
[ -n "$OMR_ADMIN_PASS2" ] && [ "$OMR_ADMIN_PASS2" != "MySecretKey" ] && OMR_ADMIN_PASS=$OMR_ADMIN_PASS2
|
||||||
OMR_ADMIN_PASS_ADMIN2=$(cat /etc/openmptcprouter-vps-admin/omr-admin-config.json | jq -r .users[0].admin.user_password | tr -d "\n")
|
OMR_ADMIN_PASS_ADMIN2=$(cat /etc/openmptcprouter-vps-admin/omr-admin-config.json | jq -r .users[0].admin.user_password | tr -d "\n")
|
||||||
[ -n "$OMR_ADMIN_PASS_ADMIN2" ] && OMR_ADMIN_PASS_ADMIN=$OMR_ADMIN_PASS_ADMIN2
|
[ -n "$OMR_ADMIN_PASS_ADMIN2" ] && [ "$OMR_ADMIN_PASS_ADMIN2" != "AdminMySecretKey" ] && OMR_ADMIN_PASS_ADMIN=$OMR_ADMIN_PASS_ADMIN2
|
||||||
fi
|
fi
|
||||||
apt-get -y install omr-vps-admin=${OMR_ADMIN_BINARY_VERSION}
|
apt-get -y install omr-vps-admin=${OMR_ADMIN_BINARY_VERSION}
|
||||||
if [ ! -f /etc/openmptcprouter-vps-admin/omr-admin-config.json ]; then
|
if [ ! -f /etc/openmptcprouter-vps-admin/omr-admin-config.json ]; then
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue