diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps index 33383f44e..1a4472421 100755 --- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps +++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps @@ -126,8 +126,8 @@ _get_ss_redir() { _get_ss_server() { config_get cf_obfs $1 obfs [ "$cf_obfs" = "1" ] && obfs="true" - config_get obfs_plugin $1 obfs_plugin - config_get obfs_type $1 obfs_type + config_get obfs_plugin $1 obfs_plugin "v2ray" + config_get obfs_type $1 obfs_type "http" } _set_ss_server_vps() { @@ -170,6 +170,22 @@ _set_ss_server_vps() { fi } +_set_v2ray_server_vps() { + enabled=$(uci -q get v2ray.main.enabled) + [ "$enabled" != "1" ] && return + userid=$(uci -q get v2ray.omrout.s_vless_user_id) + [ -z "$userid" ] && return + [ -z "$vps_config" ] && vps_config=$(_get_json "config") + [ -z "$vps_config" ] && return + current_userid="$(echo "$vps_config" | jsonfilter -q -e '@.v2ray.config.key')" + + if [ "$current_userid" != "$userid" ]; then + local settings + settings='{"userid": "'$userid'"}' + echo $(_set_json "v2ray" "$settings") + fi +} + _get_vps_config() { [ -z "$vps_config" ] && vps_config=$(_get_json "config") [ -z "$vps_config" ] && return @@ -1524,6 +1540,7 @@ _config_service() { if [ "$user_permission" != "ro" ]; then config_load shadowsocks-libev config_foreach _set_ss_server_vps server + _set_v2ray_server_vps [ -z "$(_set_glorytun_vps)" ] && error=1 [ -z "$(_set_openvpn_vps)" ] && error=1 _set_vps_firewall