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

Merge pull request #339 from Ysurac/develop

Browse source 
sync
This commit is contained in:
suyuan 2023-08-05 10:50:03 +08:00 • committed by GitHub
commit 6b4b1d703d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 42 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
openmptcprouter/files/etc/init.d/openmptcprouter-vps
View file

@ -107,6 +107,7 @@ _set_json() {
_set_glorytun_vps() {
local enabled port key
enabled="$(uci -q get glorytun.vpn.enable)"
[ "$enabled" != "1" ] && enabled="$(uci -q get glorytun-udp.vpn.enable)"
[ "$enabled" != "1" ] && echo "Glorytun disabled" && return
port="$(uci -q get glorytun.vpn.port)"
key="$(uci -q get glorytun.vpn.key)"
@ -1909,17 +1910,16 @@ _config_service() {
[ "$(uci -q get openmptcprouter.${servername}.master)" = "1" ] && {
_get_vps_config
}
[ -z "$vps_config" ] && vps_config=$(_get_json "config")
[ -z "$vps_config" ] && return
user_permission="$(echo "$vps_config" | jsonfilter -q -e '@.user.permission')"
if [ "$(uci -q get openmptcprouter.settings.firstboot)" != "0" ]; then
[ -n "$vps_config" ] && [ -n "$(cat /proc/cpuinfo | grep aes)" ] && {
[ -n "$(cat /proc/cpuinfo | grep aes)" ] && {
vps_aes="$(echo "$vps_config" | jsonfilter -q -e '@.vps.aes')"
if [ "$vps_aes" != "false" ] && [ "$user_permission" != "ro" ]; then
logger -t "OMR-VPS" "CPU support AES, set it by default"
method="$(uci -q get shadowsocks-libev.sss0.method)"
uci -q batch <<-EOF >/dev/null
set openmptcprouter.settings.encryption="aes-256-gcm"
commit openmptcprouter
set glorytun.vpn.chacha20="0"
commit glorytun
set glorytun-udp.vpn.chacha="0"
@ -1934,6 +1934,11 @@ _config_service() {
fi
}
fi
[ -z "$vps_config" ] && vps_config=$(_get_json "config")
[ -z "$vps_config" ] && return
user_permission="$(echo "$vps_config" | jsonfilter -q -e '@.user.permission')"
if [ "$user_permission" != "ro" ]; then
#config_load shadowsocks-libev
#config_foreach _set_ss_server_vps server

6
openmptcprouter/files/etc/uci-defaults/1950-omr-diag
View file

@ -2,9 +2,9 @@
uci -q batch <<-EOF >/dev/null
set luci.diag=internal
set luci.diag.ping="openmptcprouter.com"
set luci.diag.dns="openmptcprouter.com"
set luci.diag.route="openmptcprouter.com"
set luci.diag.ping="www.openmptcprouter.com"
set luci.diag.dns="www.openmptcprouter.com"
set luci.diag.route="www.openmptcprouter.com"
set luci.diag.iperf3="ping-ams1.online.net"
set luci.diag.getip="ip.openmptcprouter.com"
commit luci