diff --git a/openmptcprouter/files/etc/uci-defaults/1960-omr-qos b/openmptcprouter/files/etc/uci-defaults/1960-omr-qos deleted file mode 100755 index 1eba41af4..000000000 --- a/openmptcprouter/files/etc/uci-defaults/1960-omr-qos +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -if [ -z "$(uci -q get qos.omrvpn)" ]; then - uci -q batch <<-EOF >/dev/null - delete qos.wan - set qos.wan1=interface - set qos.wan1.classgroup="Default" - set qos.wan1.enabled="0" - set qos.wan1.upload="4000" - set qos.wan1.download="100000" - set qos.wan2=interface - set qos.wan2.classgroup="Default" - set qos.wan2.enabled="0" - set qos.wan2.upload="4000" - set qos.wan2.download="100000" - set qos.omrvpn=interface - set qos.omrvpn.classgroup="Default" - set qos.omrvpn.enabled="0" - set qos.omrvpn.interface="tun0" - set qos.omrvpn.upload="0" - set qos.omrvpn.download="0" - set qos.omrvpn.qdisc="cake" - set qos.omrvpn.script="layer_cake.qos" - delete qos.@classify[-1] - add qos classify - set qos.@classify[-1].target='Express' - set qos.@classify[-1].ports='5600' - set qos.@classify[-1].comments='SIP' - add qos classify - set qos.@classify[-1].target='Express' - set qos.@classify[-1].portrange='27000-27050' - set qos.@classify[-1].proto='udp' - set qos.@classify[-1].comments='Steam' - commit qos - EOF - if [ "$(uci -q get network.wan3)" != "" ]; then - uci -q batch <<-EOF >/dev/null - set qos.wan3=interface - set qos.wan3.classgroup="Default" - set qos.wan3.enabled="0" - set qos.wan3.upload="4000" - set qos.wan3.download="100000" - commit qos - EOF - fi - if [ "$(uci -q get network.wan4)" != "" ]; then - uci -q batch <<-EOF >/dev/null - set qos.wan4=interface - set qos.wan4.classgroup="Default" - set qos.wan4.enabled="0" - set qos.wan4.upload="4000" - set qos.wan4.download="100000" - commit qos - EOF - fi -fi -rm -f /tmp/luci-indexcache - -exit 0 diff --git a/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm b/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm deleted file mode 100755 index ace19d8a4..000000000 --- a/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh -if [ "$(uci -q get openmptcprouter.settings.version)" = "" ]; then - if [ "$(uci -q get sqm.wan1)" = "" ]; then - wan1="$(uci -q get network.wan1.device)" - wan2="$(uci -q get network.wan2.device)" - uci -q batch <<-EOF >/dev/null - delete sqm.eth1 - set sqm.wan1=queue - set sqm.wan1.qdisc="fq_codel" - set sqm.wan1.script="simple.qos" - set sqm.wan1.qdisc_advanced='0' - set sqm.wan1.linklayer='none' - set sqm.wan1.enabled='1' - set sqm.wan1.interface="${wan1}" - set sqm.wan1.download='0' - set sqm.wan1.upload='0' - set sqm.wan1.debug_logging='0' - set sqm.wan1.verbosity='5' - set sqm.wan1.iqdisc_opts='autorate-ingress dual-dsthost' - set sqm.wan1.eqdisc_opts='dual-srchost' - set sqm.wan2=queue - set sqm.wan2.qdisc="fq_codel" - set sqm.wan2.script="simple.qos" - set sqm.wan2.qdisc_advanced='0' - set sqm.wan2.linklayer='none' - set sqm.wan2.enabled='1' - set sqm.wan2.interface="${wan2}" - set sqm.wan2.download='0' - set sqm.wan2.upload='0' - set sqm.wan2.debug_logging='0' - set sqm.wan2.verbosity='5' - set sqm.wan2.iqdisc_opts='autorate-ingress dual-dsthost' - set sqm.wan2.eqdisc_opts='dual-srchost' - commit sqm - EOF - if [ "$(uci -q get network.wan3)" != "" ]; then - wan3="$(uci -q get network.wan3.device)" - uci -q batch <<-EOF >/dev/null - set sqm.wan3=queue - set sqm.wan3.qdisc="fq_codel" - set sqm.wan3.script="simple.qos" - set sqm.wan3.qdisc_advanced='0' - set sqm.wan3.linklayer='none' - set sqm.wan3.enabled='1' - set sqm.wan3.interface="${wan3}" - set sqm.wan3.download='0' - set sqm.wan3.upload='0' - set sqm.wan3.debug_logging='0' - set sqm.wan3.verbosity='5' - set sqm.wan3.iqdisc_opts='autorate-ingress dual-dsthost' - set sqm.wan3.eqdisc_opts='dual-srchost' - commit sqm - EOF - fi - if [ "$(uci -q get network.wan4)" != "" ]; then - wan4="$(uci -q get network.wan4.device)" - uci -q batch <<-EOF >/dev/null - set sqm.wan4=queue - set sqm.wan4.qdisc="fq_codel" - set sqm.wan4.script="simple.qos" - set sqm.wan4.qdisc_advanced='0' - set sqm.wan4.linklayer='none' - set sqm.wan4.enabled='1' - set sqm.wan4.interface="${wan4}" - set sqm.wan4.download='0' - set sqm.wan4.upload='0' - set sqm.wan4.debug_logging='0' - set sqm.wan4.verbosity='5' - set sqm.wan4.iqdisc_opts='autorate-ingress dual-dsthost' - set sqm.wan4.eqdisc_opts='dual-srchost' - commit sqm - EOF - fi - fi -fi - -if [ "$(uci -q get sqm.omrvpn)" = "" ]; then - uci -q batch <<-EOF >/dev/null - set sqm.omrvpn=queue - set sqm.omrvpn.qdisc="cake" - set sqm.omrvpn.script="piece_of_cake.qos" - set sqm.omrvpn.qdisc_advanced='0' - set sqm.omrvpn.linklayer='none' - set sqm.omrvpn.enabled='1' - set sqm.omrvpn.interface=tun0 - set sqm.omrvpn.download='0' - set sqm.omrvpn.upload='0' - set sqm.omrvpn.debug_logging='0' - set sqm.omrvpn.verbosity='5' - set sqm.omrvpn.overhead='40' - set sqm.omrvpn.iqdisc_opts='autorate-ingress' - commit sqm - EOF -fi - -sed -i 's/SQM_SYSLOG=1/SQM_SYSLOG=0/g' /etc/sqm/sqm.conf - -rm -f /tmp/luci-indexcache - -exit 0 diff --git a/openmptcprouter/files/etc/uci-defaults/2060-omr-system b/openmptcprouter/files/etc/uci-defaults/2060-omr-system index 4a4a37962..933c0d693 100755 --- a/openmptcprouter/files/etc/uci-defaults/2060-omr-system +++ b/openmptcprouter/files/etc/uci-defaults/2060-omr-system @@ -6,10 +6,10 @@ uci -q batch <<-EOF >/dev/null set system.ntp.enable_server='1' set system.ntp.enabled='1' del system.ntp.server - add_list system.ntp.server='0.pool.ntp.org' - add_list system.ntp.server='1.pool.ntp.org' - add_list system.ntp.server='2.pool.ntp.org' - add_list system.ntp.server='3.pool.ntp.org' + add_list system.ntp.server='ntp.aliyun.com' + add_list system.ntp.server='time1.cloud.tencent.com' + add_list system.ntp.server='time.ustc.edu.cn' + add_list system.ntp.server='cn.pool.ntp.org' commit system set rpcd.@rpcd[0].timeout=120 commit rpcd