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

Check for pihole when all is configured

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2019-08-26 21:07:17 +02:00
parent 86d755cf10
commit c92bf3699a
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -278,7 +278,7 @@ set_pihole() {
set openmptcprouter.${servername}.pihole='1' set openmptcprouter.${servername}.pihole='1'
commit openmptcprouter commit openmptcprouter
EOF EOF
elif [ "$piholeomr" != "0" ]; then elif [ "$pihole" = "false" ] && [ "$piholeomr" != "0" ]; then
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set openmptcprouter.${servername}.pihole='0' set openmptcprouter.${servername}.pihole='0'
commit openmptcprouter commit openmptcprouter
@ -688,7 +688,6 @@ _config_service() {
} }
fi fi
uci -q set openmptcprouter.settings.firstboot=0 uci -q set openmptcprouter.settings.firstboot=0
set_pihole
config_load shadowsocks-libev config_load shadowsocks-libev
config_foreach _set_ss_server_vps server config_foreach _set_ss_server_vps server
@ -701,6 +700,7 @@ _config_service() {
[ -z "$(_set_redirect_ports_from_vps $redirect_port)" ] && error=1 [ -z "$(_set_redirect_ports_from_vps $redirect_port)" ] && error=1
[ -z "$(_set_mptcp_vps)" ] && error=1 [ -z "$(_set_mptcp_vps)" ] && error=1
[ -z "$(_set_vpn_vps)" ] && error=1 [ -z "$(_set_vpn_vps)" ] && error=1
set_pihole
[ "$error" = 0 ] && uci -q set openmptcprouter.${servername}.lastchange=$(date "+%s") [ "$error" = 0 ] && uci -q set openmptcprouter.${servername}.lastchange=$(date "+%s")
uci -q batch <<-EOF >/dev/null uci -q batch <<-EOF >/dev/null
set openmptcprouter.${servername}.admin_error=$error set openmptcprouter.${servername}.admin_error=$error