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

Fix merge

This commit is contained in:
Ycarus (Yannick Chabanois) 2020-08-19 15:44:21 +02:00
commit cb2c143b40
26 changed files with 2772 additions and 288 deletions

View file

@ -8,7 +8,7 @@ trap : HUP INT TERM
if [ -z "$INTERFACE" ]; then
curl -6 http://$HOST/files/10Gio.dat >/dev/null || echo
else
hostip=$(dig +short A $HOST | tr -d "\n")
hostip=$(dig +short AAAA $HOST | tr -d "\n")
ipset add ss_rules6_dst_bypass_all $hostip
curl -6 --interface $INTERFACE http://$HOST/files/10Gio.dat >/dev/null || echo
ipset del ss_rules6_dst_bypass_all $hostip

View file

@ -1,5 +1,5 @@
#!/bin/sh
if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ]; then
if [ "$(uci -q get openmptcprouter.settings.version)" = "" ]; then
if [ "$(uci -q get sqm.wan1)" = "" ]; then
wan1="$(uci -q get network.wan1.ifname)"
wan2="$(uci -q get network.wan2.ifname)"
@ -11,7 +11,7 @@ if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ]; then
set sqm.wan1.qdisc_advanced='0'
set sqm.wan1.linklayer='none'
set sqm.wan1.enabled='0'
set sqm.wan1.interface=$wan1
set sqm.wan1.interface="${wan1}"
set sqm.wan1.download='0'
set sqm.wan1.upload='0'
set sqm.wan1.debug_logging='0'
@ -24,7 +24,7 @@ if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ]; then
set sqm.wan2.qdisc_advanced='0'
set sqm.wan2.linklayer='none'
set sqm.wan2.enabled='0'
set sqm.wan2.interface=$wan2
set sqm.wan2.interface="${wan2}"
set sqm.wan2.download='0'
set sqm.wan2.upload='0'
set sqm.wan2.debug_logging='0'
@ -42,7 +42,7 @@ if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ]; then
set sqm.wan3.qdisc_advanced='0'
set sqm.wan3.linklayer='none'
set sqm.wan3.enabled='0'
set sqm.wan3.interface=$wan3
set sqm.wan3.interface="${wan3}"
set sqm.wan3.download='0'
set sqm.wan3.upload='0'
set sqm.wan3.debug_logging='0'
@ -61,7 +61,7 @@ if [ "$(uci -q get openmptcprouter.latest_versions)" = "" ]; then
set sqm.wan4.qdisc_advanced='0'
set sqm.wan4.linklayer='none'
set sqm.wan4.enabled='0'
set sqm.wan4.interface=$wan4
set sqm.wan4.interface="${wan4}"
set sqm.wan4.download='0'
set sqm.wan4.upload='0'
set sqm.wan4.debug_logging='0'

View file

@ -6,6 +6,8 @@ uci -q batch <<-EOF >/dev/null
commit system
set rpcd.@rpcd[0].timeout=120
commit rpcd
luci.apply.timeout='20'
commit luci
EOF
[ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep raspberry)" ] && [ "$(uci -q get openmptcprouter.settings.scaling_governor)" != "performance" ] && {