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

Fix and new settings for dsvpn

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2019-08-05 16:56:05 +02:00
parent 1d7bee7948
commit 58b9d0c45e
3 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dsvpn/init
View file

@ -45,11 +45,13 @@ start_instance() {
echo "${key}" > /tmp/${PROG_NAME}-${1}.key
key=""
if [ "$(uci -q get network.omrvpn)" != "" ]; then
if [ "$(uci -q get network.omrvpn)" != "" ] && [ "$(uci -q get network.omrvpn)" != "$dev" ]; then
uci -q set network.omrvpn.ifname=$dev
uci -q commit
fi
ip addr flush $dev
_log "starting ${PROG_NAME} ${1} instance $*"
procd_open_instance

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

@ -298,6 +298,19 @@ _get_vps_config() {
/etc/init.d/dnsmasq restart >/dev/null 2>&1
fi
fi
if [ "$vpn" = "dsvpn" ]; then
if [ "$pihole" = "true" ] && [ "$(uci -q get dhcp.@dnsmasq[0].server)" != "$host_ip#53" ]; then
host_ip="$(echo "$vps_config" | jsonfilter -q -e '@.dsvpn.host_ip')"
uci -q batch <<-EOF >/dev/null
delete dhcp.@dnsmasq[0].server
add_list dhcp.@dnsmasq[0].server="$host_ip#53"
set dhcp.@dnsmasq[0].rebind_protection='0'
commit dhcp
EOF
logger -t "OMR-VPS" "Restart dnsmasq..."
/etc/init.d/dnsmasq restart >/dev/null 2>&1
fi
fi
if [ "$glorytun_change" != "0" ]; then
logger -t "OMR-VPS" "Restart glorytun..."
uci -q batch <<-EOF >/dev/null
@ -380,7 +393,7 @@ _set_ss_redir() {
}
_set_config_from_vps() {
local shadowsocks_disabled vpn glorytun_state redirect shorewall_redirect mlvpn_key openvpn_key
local shadowsocks_disabled vpn glorytun_state redirect shorewall_redirect mlvpn_key openvpn_key dsvpn_key
[ -z "$vps_config" ] && vps_config=$(_get_json "config")
[ -z "$vps_config" ] && return
@ -482,6 +495,17 @@ _set_config_from_vps() {
/etc/init.d/mlvpn restart
fi
# DSVPN settings
dsvpn_key="$(echo "$vps_config" | jsonfilter -q -e '@.dsvpn.key')"
if [ -n "$dsvpn_key" ] && [ "$dsvpn_key" != "$(uci -q get dsvpn.vpn.key)" ]; then
uci -q batch <<-EOF >/dev/null
set dsvpn.vpn.key=$dsvpn_key
commit dsvpn
EOF
logger -t "OMR-VPS" "DSVPN restart..."
/etc/init.d/dsvpn restart
fi
# Shorewall settings
shorewall_redirect="$(echo "$vps_config" | jsonfilter -q -e '@.shorewall.redirect_ports')"
[ "$shorewall_redirect" = "enable" ] && redirect="1"
@ -639,6 +663,6 @@ start_service() {
}
service_triggers() {
procd_add_reload_trigger openmptcprouter shadowsocks-libev glorytun mlvpn openvpn network upnpd
procd_add_reload_trigger openmptcprouter shadowsocks-libev glorytun mlvpn openvpn network upnpd dsvpn
#procd_add_reload_trigger openmptcprouter shadowsocks-libev network upnpd
}

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

@ -44,7 +44,7 @@ if [ "$(uci -q get dsvpn.vpn)" = "" ]; then
set dsvpn.vpn.dev=tun0
set dsvpn.vpn.port=65011
set dsvpn.vpn.localip=10.255.251.2
set dsvpn.vpn.remoteip=10.255.251.2
set dsvpn.vpn.remoteip=10.255.251.1
set dsvpn.vpn.enabled=0
commit dsvpn
EOF