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 #350 from Ysurac/develop

Browse source 
sync
This commit is contained in:
suyuan 2023-09-01 21:08:46 +08:00 • committed by GitHub
commit 71b7728df8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 218 additions and 488 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1770,6 +1770,7 @@ _backup_get() {
_backup_get_and_apply() {
servername=$1
backupfile=$2
token=""
vps_config=""
_login
@ -1780,7 +1781,12 @@ _backup_get_and_apply() {
EOF
return
}
vps_backup=$(_get_json "backupget")
if [ -n "$backupfile" ]; then
echo "get $backupfile"
vps_backup=$(_get_json "backupget?filename=${backupfile}")
else
vps_backup=$(_get_json "backupget")
fi
[ -z "$vps_backup" ] && return
backup_data="$(echo "$vps_backup" | jsonfilter -q -e '@.data')"
backup_sha256sum="$(echo "$vps_backup" | jsonfilter -q -e '@.sha256sum')"
@ -1791,11 +1797,16 @@ _backup_get_and_apply() {
}
backup_get() {
lastbackup=""
serverbackup=""
config_load openmptcprouter
config_foreach _backup_get server
[ -n "$serverbackup" ] && _backup_get_and_apply $serverbackup
backuptoapply=$2
if [ -n "$backuptoapply" ]; then
_backup_get_and_apply $1 $2
else
lastbackup=""
serverbackup=""
config_load openmptcprouter
config_foreach _backup_get server
[ -n "$serverbackup" ] && _backup_get_and_apply $serverbackup
fi
}
_backup_list() {
@ -1819,6 +1830,13 @@ _backup_list() {
backup_lastmodif="$(echo "$vps_backup" | jsonfilter -q -e '@.modif')"
[ -n "$backup_lastmodif" ] && {
uci -q set openmptcprouter.$servername.lastbackup=$backup_lastmodif
backup_all="$(echo "$vps_backup" | jsonfilter -q -e '@.sorted[*]')"
uci -q del openmptcprouter.$servername.allbackup
echo "$vps_backup" | jsonfilter -q -e '@.sorted[*]' | while read backup; do
name=$(echo "$backup" | jsonfilter -q -e '@[0]' | tr -d '\n')
modiftime=$(echo "$backup" | jsonfilter -q -e '@[1]' | tr -d '\n')
uci -q add_list openmptcprouter.$servername.allbackup="${name}|${modiftime}"
done
}
}

8
openmptcprouter/files/etc/uci-defaults/2020-omr-vpn
View file

@ -149,16 +149,16 @@ if [ "$(uci -q get network.tun0.mtu)" = "1200" ] || [ -z "$(uci -q get network.t
uci -q batch <<-EOF >/dev/null
set network.tun0=device
set network.tun0.name='tun0'
set network.tun0.mtu=9000
set network.tun0.mtu=1500
commit network
EOF
fi
if [ "$(uci -q get openmptcprouter.settings.vpn)" = "" ]; then
uci -q batch <<-EOF >/dev/null
set openmptcprouter.settings.vpn='glorytun_udp'
set glorytun-udp.vpn.enable='1'
commit glorytun-udp
set openmptcprouter.settings.vpn='glorytun_tcp'
set glorytun.vpn.enable='1'
commit glorytun
commit openmptcprouter
EOF
fi