diff --git a/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua b/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua index f00afe5fd..3484b1afa 100644 --- a/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua +++ b/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua @@ -132,6 +132,11 @@ o.placeholder = "4.2.2.1" o.default = { "4.2.2.1", "8.8.8.8" } o.rmempty = false +o = s:option(DynamicList, "hosts6", translate("Hosts IPv6"),translate("Must be IPs and not domains")) +o.placeholder = "2001:4860:4860::8844" +o.default = { "2001:4860:4860::8888", "2001:4860:4860::8844" } +o.rmempty = false + s = m:section(TypedSection, "interface", translate("Interfaces")) s.template_addremove = "omr-tracker/cbi-select-add" s.addremove = true diff --git a/omr-tracker/files/etc/config/omr-tracker b/omr-tracker/files/etc/config/omr-tracker index bf64d41d1..6f9d1c258 100644 --- a/omr-tracker/files/etc/config/omr-tracker +++ b/omr-tracker/files/etc/config/omr-tracker @@ -11,6 +11,12 @@ config defaults 'defaults' list hosts '80.67.169.40' list hosts '114.114.114.114' list hosts '1.1.1.1' + list hosts6 '2606:4700:4700::1111' + list hosts6 '2606:4700:4700::1001' + list hosts6 '2620:fe::fe' + list hosts6 '2620:fe::9' + list hosts6 '2001:4860:4860::8888' + list hosts6 '2001:4860:4860::8844' option timeout '2' option tries '3' option interval '2' diff --git a/omr-tracker/files/etc/uci-defaults/omr-tracker b/omr-tracker/files/etc/uci-defaults/omr-tracker index 30aec42b9..cf2ca0dab 100755 --- a/omr-tracker/files/etc/uci-defaults/omr-tracker +++ b/omr-tracker/files/etc/uci-defaults/omr-tracker @@ -60,6 +60,18 @@ if [ "$(uci -q get omr-tracker.proxy.hosts | grep '103.224.182.242')" != "" ]; t EOF fi +if [ -z "$(uci -q get omr-tracker.defaults.hosts6)" ]; then + uci -q batch <<-EOF >/dev/null + add_list omr-tracker.defaults.hosts6='2606:4700:4700::1111' + add_list omr-tracker.defaults.hosts6='2606:4700:4700::1001' + add_list omr-tracker.defaults.hosts6='2620:fe::fe' + add_list omr-tracker.defaults.hosts6='2620:fe::9' + add_list omr-tracker.defaults.hosts6='2001:4860:4860::8888' + add_list omr-tracker.defaults.hosts6='2001:4860:4860::8844' + commit omr-tracker + EOF +fi + if [ "$(uci -q get omr-tracker.defaults.wait_test)" = "" ]; then uci -q batch <<-EOF >/dev/null set omr-tracker.defaults.wait_test=1