Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #10735 from ysc3839/vpnbypass

Browse source 
vpnbypass: add procd reload trigger for vpnbypass config
This commit is contained in:
Rosen Penev 2019-12-10 13:48:31 -08:00 committed by GitHub
commit 7e39c59e7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
net/vpnbypass/Makefile
View file

@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=vpnbypass PKG_NAME:=vpnbypass
PKG_VERSION:=1.3.1 PKG_VERSION:=1.3.1
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net> PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
@ -59,16 +59,6 @@ define Package/vpnbypass/postinst
# check if we are on real system # check if we are on real system
if [ -z "$${IPKG_INSTROOT}" ]; then if [ -z "$${IPKG_INSTROOT}" ]; then
/etc/init.d/vpnbypass enable /etc/init.d/vpnbypass enable
while uci -q del ucitrack.@vpnbypass[-1]; do :; done
uci -q batch <<-EOF >/dev/null
add ucitrack vpnbypass
set ucitrack.@vpnbypass[0].init='vpnbypass'
del_list ucitrack.@firewall[0].affects='vpnbypass'
add_list ucitrack.@firewall[0].affects='vpnbypass'
commit ucitrack
EOF
fi fi
exit 0 exit 0
endef endef
@ -77,8 +67,6 @@ define Package/vpnbypass/prerm
#!/bin/sh #!/bin/sh
# check if we are on real system # check if we are on real system
if [ -z "$${IPKG_INSTROOT}" ]; then if [ -z "$${IPKG_INSTROOT}" ]; then
while uci -q delete ucitrack.@vpnbypass[-1]; do :; done
uci -q del_list ucitrack.@firewall[0].affects='vpnbypass'
echo "Stopping service and removing rc.d symlink for vpnbypass" echo "Stopping service and removing rc.d symlink for vpnbypass"
/etc/init.d/vpnbypass stop || true /etc/init.d/vpnbypass stop || true
/etc/init.d/vpnbypass disable || true /etc/init.d/vpnbypass disable || true

3
net/vpnbypass/files/vpnbypass.init
View file

@ -115,8 +115,7 @@ service_triggers_load_interface() { is_supported_interface "$1" && ifaces="${ifa
service_triggers() { service_triggers() {
local ifaces n local ifaces n
config_load network; config_foreach service_triggers_load_interface 'interface'; config_load network; config_foreach service_triggers_load_interface 'interface';
procd_add_reload_trigger 'firewall' procd_add_reload_trigger 'firewall' 'openvpn' 'vpnbypass'
procd_add_reload_trigger 'openvpn'
procd_open_trigger procd_open_trigger
for n in $ifaces; do procd_add_reload_interface_trigger "$n"; procd_add_interface_trigger "interface.*" "$n" /etc/init.d/vpnbypass reload; done; for n in $ifaces; do procd_add_reload_interface_trigger "$n"; procd_add_interface_trigger "interface.*" "$n" /etc/init.d/vpnbypass reload; done;
output "$serviceName monitoring interfaces: $ifaces $_OK_\\n" output "$serviceName monitoring interfaces: $ifaces $_OK_\\n"