1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00

Fix VPN list

This commit is contained in:
Ycarus (Yannick Chabanois) 2020-03-03 18:28:35 +01:00
parent 75bcd46d31
commit dd92c916f3

View file

@ -651,6 +651,7 @@ _set_config_from_vps() {
vpsip="$(uci -q get openmptcprouter.${servername}.ip)" vpsip="$(uci -q get openmptcprouter.${servername}.ip)"
vps_lastchange="$(echo "$vps_config" | jsonfilter -q -e '@.vps.lastchange')" vps_lastchange="$(echo "$vps_config" | jsonfilter -q -e '@.vps.lastchange')"
user_permission="$(echo "$vps_config" | jsonfilter -q -e '@.user.permission')" user_permission="$(echo "$vps_config" | jsonfilter -q -e '@.user.permission')"
[ -z "$user_permission" ] && user_permission="rw"
# Set current VPN # Set current VPN
current_vpn="$(uci -q get openmptcprouter.settings.vpn)" current_vpn="$(uci -q get openmptcprouter.settings.vpn)"
@ -937,7 +938,6 @@ _set_config_from_vps() {
current_vpn="$(echo "$vps_config" | jsonfilter -q -e '@.vpn.current')" current_vpn="$(echo "$vps_config" | jsonfilter -q -e '@.vpn.current')"
if [ -n "$current_vpn" ]; then if [ -n "$current_vpn" ]; then
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
delete openmptcprouter.${servername}.available_vpn
set openmptcprouter.${servername}.available_vpn=${current_vpn} set openmptcprouter.${servername}.available_vpn=${current_vpn}
EOF EOF
fi fi
@ -946,7 +946,6 @@ _set_config_from_vps() {
if [ -n "$available_vpn" ]; then if [ -n "$available_vpn" ]; then
for vpn in $available_vpn; do for vpn in $available_vpn; do
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
delete openmptcprouter.${servername}.available_vpn
add_list openmptcprouter.${servername}.available_vpn=$vpn add_list openmptcprouter.${servername}.available_vpn=$vpn
EOF EOF
done done