From eb45a6b40e3dd8ac91a2c47ab134b2f51ae92f82 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 22 Nov 2021 09:02:33 +0800 Subject: [PATCH] update-11.22 --- luci-app-dnscrypt-proxy2/Makefile | 4 +- .../files/dnscrypt-proxy.config | 4 +- .../files/dnscrypt-proxy.init | 27 ++++--- .../files/dnscrypt-proxy_resolvers.init | 6 +- .../files/luci/controller/dnscrypt-proxy.lua | 2 +- .../cbi/dnscrypt-proxy/dnscrypt-proxy.lua | 6 +- .../dnscrypt-resolvers-config.lua | 2 +- .../cbi/dnscrypt-proxy/dnscrypt-resolvers.lua | 2 +- .../luci/model/cbi/dnscrypt-proxy/global.lua | 2 +- .../files/public-resolvers.config | 2 +- luci-app-godproxy/rulesupdate.log | 78 ++++++++++--------- .../resources/view/wizard/initsetup.js | 11 +-- 12 files changed, 69 insertions(+), 77 deletions(-) diff --git a/luci-app-dnscrypt-proxy2/Makefile b/luci-app-dnscrypt-proxy2/Makefile index 7bf621812..849e40a13 100644 --- a/luci-app-dnscrypt-proxy2/Makefile +++ b/luci-app-dnscrypt-proxy2/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-dnscrypt-proxy2 -PKG_VERSION:=2.0.38 -PKG_RELEASE:=2 +PKG_VERSION:=2.1.1 +PKG_RELEASE:=1 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE diff --git a/luci-app-dnscrypt-proxy2/files/dnscrypt-proxy.config b/luci-app-dnscrypt-proxy2/files/dnscrypt-proxy.config index 45c3f77c0..899be0c56 100644 --- a/luci-app-dnscrypt-proxy2/files/dnscrypt-proxy.config +++ b/luci-app-dnscrypt-proxy2/files/dnscrypt-proxy.config @@ -3,9 +3,9 @@ config dnscrypt-proxy 'ns1' option enable '0' list resolvers 'public-resolvers' option netprobe_address '114.114.114.114:53' - option fallback_resolvers '114.114.114.114:53' + option bootstrap_resolvers '114.114.114.114:53' option listen_addresses '127.0.0.1:5335' option force 'cache dnscrypt_servers lb_estimator ignore_system_dns block_unqualified block_undelegated ipv4_servers require_nofilter require_nolog doh_servers block_ipv6' list forwarding_rules '/etc/dnsmasq.oversea/oversea_list.conf' - list blacklist '/usr/share/adbyby/dnsmasq.adblock' + list blocked_names '/usr/share/adbyby/dnsmasq.adblock' diff --git a/luci-app-dnscrypt-proxy2/files/dnscrypt-proxy.init b/luci-app-dnscrypt-proxy2/files/dnscrypt-proxy.init index 043c841fe..fc53c12f8 100644 --- a/luci-app-dnscrypt-proxy2/files/dnscrypt-proxy.init +++ b/luci-app-dnscrypt-proxy2/files/dnscrypt-proxy.init @@ -104,7 +104,7 @@ include_for_firewall_reload() { } create_config_file() { - local server_names listen_address query_meta max_clients fallback_resolvers netprobe_address + local server_names listen_address query_meta max_clients bootstrap_resolvers netprobe_address local disabled_server_names log_file log_level timeout keepalive cert_refresh_delay netprobe_timeout local log_files_max_size log_files_max_age log_files_max_backups reject_ttl local reject_ttl cache_size cache_min_ttl cache_max_ttl cache_neg_min_ttl cache_neg_max_ttl @@ -121,7 +121,7 @@ create_config_file() { config_get listen_addresses $1 'listen_addresses' '127.0.0.1:5335' config_get query_meta $1 'query_meta' '' config_get max_clients $1 'max_clients' '250' - config_get fallback_resolvers $1 'fallback_resolvers' '114.114.114.114:53' + config_get bootstrap_resolvers $1 'bootstrap_resolvers' '114.114.114.114:53' config_get netprobe_address $1 'netprobe_address' '114.114.114.114:53' config_get disabled_server_names $1 'disabled_server_names' '' @@ -155,7 +155,7 @@ create_config_file() { append_multivalue_param "listen_addresses" "$listen_addresses" $config_path append_multivalue_param "query_meta" "$query_meta" $config_path append_param "max_clients" "$max_clients" $config_path - append_multivalue_param "fallback_resolvers" "$fallback_resolvers" $config_path + append_multivalue_param "bootstrap_resolvers" "$bootstrap_resolvers" $config_path append_str_param "netprobe_address" "$netprobe_address" $config_path append_multivalue_param "disabled_server_names" "$disabled_server_names" $config_path @@ -184,7 +184,6 @@ create_config_file() { append_param "cloak_ttl" "$cloak_ttl" $config_path force_defaults=' -daemonize,true lb_estimator,true ignore_system_dns,true block_unqualified,true @@ -271,7 +270,7 @@ cert_ignore_timestamp,false dstf="$CONFIG_DIR/dnscrypt_forwarding_rules.txt" two_line_header='#dnscrypt forwarding rule file.\n' - forward_resolvers="$fallback_resolvers" + forward_resolvers="$bootstrap_resolvers" append_list_file $1 "forwarding_rules" "forwarding_rules" "$dstf" "" $config_path "$two_line_header" $forward_resolvers dstf="$CONFIG_DIR/dnscrypt_cloaking_rules.txt" @@ -286,20 +285,20 @@ cert_ignore_timestamp,false append_str_param "file" "${LOG_FILE}_nx.log" $config_path append_str_param "format" "tsv" $config_path - echo "[blacklist]" >> $config_path - dstf="$CONFIG_DIR/dnscrypt_domain_black.txt" + echo "[blocked_names]" >> $config_path + dstf="$CONFIG_DIR/dnscrypt_blocked_names.txt" two_line_header='#dnscrypt domain black list file.\n*.test\n*.onion\n*.localhost\n*.local\n*.invalid\n*.bind\n*.lan\n*.internal\n*.intranet\n*.private\n*.workgroup\n*.10.in-addr.arpa\n*.16.172.in-addr.arpa\n*.168.192.in-addr.arpa\n*.254.169.in-addr.arpa\n*.d.f.ip6.arpa' - append_list_file $1 "blacklist" "blacklist_file" "$dstf" "bd.log" $config_path "$two_line_header" + append_list_file $1 "blocked_names" "blocked_names_file" "$dstf" "bd.log" $config_path "$two_line_header" - echo "[ip_blacklist]" >> $config_path - dstf="$CONFIG_DIR/dnscrypt_ip_blacklist.txt" + echo "[blocked_ips]" >> $config_path + dstf="$CONFIG_DIR/dnscrypt_blocked_ips.txt" two_line_header='#dnscrypt ip black list file.\n127.*\n192.168.*' - append_list_file $1 "ip_blacklist" "blacklist_file" "$dstf" "bi.log" $config_path "$two_line_header" + append_list_file $1 "blocked_ips" "blocked_ips_file" "$dstf" "bi.log" $config_path "$two_line_header" - echo "[whitelist]" >> $config_path - dstf="$CONFIG_DIR/dnscrypt_whitelist.txt" + echo "[allowed_names]" >> $config_path + dstf="$CONFIG_DIR/dnscrypt_allowed_names.txt" two_line_header='#dnscrypt white list file.\n' - append_list_file $1 "whitelist" "whitelist_file" "$dstf" "wd.log" $config_path "$two_line_header" + append_list_file $1 "allowed_names" "allowed_names_file" "$dstf" "wd.log" $config_path "$two_line_header" echo "[static]" >> $config_path append_static_resolver() { diff --git a/luci-app-dnscrypt-proxy2/files/dnscrypt-proxy_resolvers.init b/luci-app-dnscrypt-proxy2/files/dnscrypt-proxy_resolvers.init index 619e2ccb5..37445fbba 100644 --- a/luci-app-dnscrypt-proxy2/files/dnscrypt-proxy_resolvers.init +++ b/luci-app-dnscrypt-proxy2/files/dnscrypt-proxy_resolvers.init @@ -43,7 +43,7 @@ cache_file() { local tmpf="/tmp/dnscrypt_${cdl##*/}.dl" local line [ ! -f "$fn" ] && { - wget -q --no-check-certificate -t 3 -T 30 -O "$tmpf" "$cdl" + wget -q --no-check-certificate -t 3 -O "$tmpf" "$cdl" [ $? -eq 0 ] || return line=$(cat "$tmpf" | wc -l) [ $line -gt 1 ] || return @@ -95,8 +95,8 @@ update() { json_set_namespace "resolvers" "pre" json_init echo "INFO: JSON parsing [$file]..." > $LUCI_STATUS - echo "{'resolvers':$(cat $file)}" > "/tmp/${file##*\}.ld" - json_load_file "/tmp/${file##*\}.ld" + echo "{'resolvers':$(cat $file)}" > "/tmp/${file##*/}.ld" + json_load_file "/tmp/${file##*/}.ld" local type resolvers resolver keys key val local sname name addrs ports proto stamp country description dnssec ipv6 location nofilter nolog diff --git a/luci-app-dnscrypt-proxy2/files/luci/controller/dnscrypt-proxy.lua b/luci-app-dnscrypt-proxy2/files/luci/controller/dnscrypt-proxy.lua index bd26cbd17..3977ae6b8 100644 --- a/luci-app-dnscrypt-proxy2/files/luci/controller/dnscrypt-proxy.lua +++ b/luci-app-dnscrypt-proxy2/files/luci/controller/dnscrypt-proxy.lua @@ -76,7 +76,7 @@ function resolve_cmd() local set = luci.http.formvalue("set") local retstring="

" -retstring = luci.sys.exec("/usr/sbin/dnscrypt-proxy -resolve www.google.com") +retstring = luci.sys.exec("/usr/sbin/dnscrypt-proxy -resolve www.google.com,127.0.0.1:7915 -config /var/etc/dnscrypt-proxy-ns1.conf") luci.http.prepare_content("application/json") luci.http.write_json({ ret=retstring }) end diff --git a/luci-app-dnscrypt-proxy2/files/luci/model/cbi/dnscrypt-proxy/dnscrypt-proxy.lua b/luci-app-dnscrypt-proxy2/files/luci/model/cbi/dnscrypt-proxy/dnscrypt-proxy.lua index 319a677f3..e829376ce 100644 --- a/luci-app-dnscrypt-proxy2/files/luci/model/cbi/dnscrypt-proxy/dnscrypt-proxy.lua +++ b/luci-app-dnscrypt-proxy2/files/luci/model/cbi/dnscrypt-proxy/dnscrypt-proxy.lua @@ -37,7 +37,7 @@ o.placeholder = o.default o.optional = false o.rmempty = false -o = s:option(Value, "fallback_resolvers", translate("Fallback resolvers"), translate("DNS resolver on query fails or for forced forwarding domain list.") .. translate("Split MultiValues by a comma")) +o = s:option(Value, "bootstrap_resolvers", translate("Fallback resolvers"), translate("DNS resolver on query fails or for forced forwarding domain list.") .. translate("Split MultiValues by a comma")) o.default = "114.114.114.114:53" o.placeholder = o.default o.optional = false @@ -126,13 +126,13 @@ o.placeholder = "/etc/dnsmasq.oversea/oversea_list.conf" o.optional = true o.rmempty = true -o = s:option(DynamicList, "blacklist", translate("Domain Black List"), translate("Domains to blacklist, [.conf|.adblock] file treat like dnsmasq configure: ") .. "https://download.dnscrypt.info/blacklists/domains/mybase.txt") +o = s:option(DynamicList, "blocked_named", translate("Domain Black List"), translate("Domains to blacklist, [.conf|.adblock] file treat like dnsmasq configure: ") .. "https://download.dnscrypt.info/blacklists/domains/mybase.txt") o.default = "/etc/dnsmasq.ssr/ad.conf" o.placeholder = "/usr/share/adbyby/dnsmasq.adblock" o.optional = true o.rmempty = true -o = s:option(DynamicList, "ip_blacklist", translate("IP Address List"), translate("IP Address to blacklist, [.conf] file treat like dnsmasq configure: ") .. "https://download.dnscrypt.info/blacklists/domains/mybase.txt") +o = s:option(DynamicList, "blocked_ips", translate("IP Address List"), translate("IP Address to blacklist, [.conf] file treat like dnsmasq configure: ") .. "https://download.dnscrypt.info/blacklists/ips/mybase.txt") o.default = "https://download.dnscrypt.info/blacklists/domains/mybase.txt" o.placeholder = "/etc/dnsmasq.ssr/ad.conf" o.optional = true diff --git a/luci-app-dnscrypt-proxy2/files/luci/model/cbi/dnscrypt-proxy/dnscrypt-resolvers-config.lua b/luci-app-dnscrypt-proxy2/files/luci/model/cbi/dnscrypt-proxy/dnscrypt-resolvers-config.lua index 1dece261b..77c0420c6 100644 --- a/luci-app-dnscrypt-proxy2/files/luci/model/cbi/dnscrypt-proxy/dnscrypt-resolvers-config.lua +++ b/luci-app-dnscrypt-proxy2/files/luci/model/cbi/dnscrypt-proxy/dnscrypt-resolvers-config.lua @@ -89,7 +89,7 @@ o.rmempty = true o = s:option(Value, "format", translate("Version"), translate("Configure file version.")) o.optional = true -o.default = "v2" +o.default = "v3" o.rmempty = true s = m:section(TypedSection, 'dnscrypt', translate("DNSCrypt Resolver Info")) diff --git a/luci-app-dnscrypt-proxy2/files/luci/model/cbi/dnscrypt-proxy/dnscrypt-resolvers.lua b/luci-app-dnscrypt-proxy2/files/luci/model/cbi/dnscrypt-proxy/dnscrypt-resolvers.lua index bd30f9c44..55c8ed860 100644 --- a/luci-app-dnscrypt-proxy2/files/luci/model/cbi/dnscrypt-proxy/dnscrypt-resolvers.lua +++ b/luci-app-dnscrypt-proxy2/files/luci/model/cbi/dnscrypt-proxy/dnscrypt-resolvers.lua @@ -11,7 +11,7 @@ cfg = "dnscrypt-proxy" local dnslist_table = {} for _, s in pairs(dc:dns_list()) do - if s.name ~= nil then + if s.addrs ~= nil then dnslist_table[#dnslist_table+1] = "%s.%s:%s@%s://%s:%s" %{s.resolver, s.country, s.name, s.proto, s.addrs, s.ports} end end diff --git a/luci-app-dnscrypt-proxy2/files/luci/model/cbi/dnscrypt-proxy/global.lua b/luci-app-dnscrypt-proxy2/files/luci/model/cbi/dnscrypt-proxy/global.lua index 957ad8e75..5861d0302 100644 --- a/luci-app-dnscrypt-proxy2/files/luci/model/cbi/dnscrypt-proxy/global.lua +++ b/luci-app-dnscrypt-proxy2/files/luci/model/cbi/dnscrypt-proxy/global.lua @@ -62,7 +62,7 @@ end o = s:option(Button, "dnscrypt_ck", translate("DNS resolve test")) o.rawhtml = true o.template = "dnscrypt-proxy/resolve" -o.description = translate("Check DNSCrypt resolver: ") .. "/usr/sbin/dnscrypt-proxy -resolve www.google.com" +o.description = translate("Check DNSCrypt resolver: ") .. "/usr/sbin/dnscrypt-proxy -resolve www.google.com,127.0.0.1:7915 -config /var/etc/dnscrypt-proxy-ns1.conf" -- [[ Caches ]]-- s = m:section(TypedSection, cfg, translate("Cache Management"), translate("Running resolver details and offline caches manipulating.")) diff --git a/luci-app-dnscrypt-proxy2/files/public-resolvers.config b/luci-app-dnscrypt-proxy2/files/public-resolvers.config index 890431e83..f5966bcfb 100644 --- a/luci-app-dnscrypt-proxy2/files/public-resolvers.config +++ b/luci-app-dnscrypt-proxy2/files/public-resolvers.config @@ -1,6 +1,6 @@ config source 'global' - option urls 'https://github.com/DNSCrypt/dnscrypt-resolvers/raw/master/v2/public-resolvers.md' + option urls 'https://github.com/DNSCrypt/dnscrypt-resolvers/raw/master/v3/public-resolvers.md' option details_json 'https://download.dnscrypt.info/dnscrypt-resolvers/json/public-resolvers.json' option minisign_key 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3' option cache_mode '1' diff --git a/luci-app-godproxy/rulesupdate.log b/luci-app-godproxy/rulesupdate.log index 98ad98a88..748c25f18 100644 --- a/luci-app-godproxy/rulesupdate.log +++ b/luci-app-godproxy/rulesupdate.log @@ -1,38 +1,40 @@ -2021-11-21 14:09:31: ------------------- 规则更新 ----------------------- -2021-11-21 14:09:31: ==================================================== -2021-11-21 14:09:31: 开始更新koolproxy的规则，请等待... -2021-11-21 14:09:31: --------------------------------------------------------------------------------------- -2021-11-21 14:09:31: Yhosts规则本地版本号： 202111082343 -2021-11-21 14:09:31: Yhosts规则在线版本号： 202111082343 -2021-11-21 14:09:31: 检测到Yhosts本地版本号和在线版本号相同，那还更新个毛啊! -2021-11-21 14:09:31: --------------------------------------------------------------------------------------- -2021-11-21 14:09:32: Antiad规则本地版本号： 20211120024124 -2021-11-21 14:09:32: Antiad规则在线版本号： 20211120024124 -2021-11-21 14:09:32: 检测到 Antiad规则 本地版本号和在线版本号相同，那还更新个毛啊! -2021-11-21 14:09:32: --------------------------------------------------------------------------------------- -2021-11-21 14:09:32: StevenBlack规则本地版本号： 18 November 2021 03:49:14 -2021-11-21 14:09:32: StevenBlack规则在线版本号： 18 November 2021 03:49:14 -2021-11-21 14:09:32: 检测到 StevenBlack规则 本地版本号和在线版本号相同，那还更新个毛啊! -2021-11-21 14:09:32: --------------------------------------------------------------------------------------- -2021-11-21 14:09:32: AdGuard DNS规则本地版本号： 2021-11-21T12:07:42.648Z -2021-11-21 14:09:32: AdGuard DNS规则在线版本号： 2021-11-21T12:07:42.648Z -2021-11-21 14:09:32: 检测到 AdGuard DNS规则 本地版本号和在线版本号相同，那还更新个毛啊! -2021-11-21 14:09:32: --------------------------------------------------------------------------------------- -2021-11-21 14:09:32: ADgk规则本地版本号： 20211120183731 -2021-11-21 14:09:32: ADgk规则在线版本号： 20211120183731 -2021-11-21 14:09:32: 检测到 ADgk规则 本地版本号和在线版本号相同，那还更新个毛啊! -2021-11-21 14:09:32: 跳过优化 补充规则Yhosts。。。。。 -2021-11-21 14:09:32: 跳过优化 补充规则Antiad。。。。。 -2021-11-21 14:09:32: 跳过优化 补充规则StevenBlack。。。。。 -2021-11-21 14:09:32: 跳过优化 补充规则 AdGuard DNS。。。。。 -2021-11-21 14:09:32: 跳过优化 ADgk规则。。。。。 -2021-11-21 14:09:32: 所有规则更新并优化完毕！ -2021-11-21 14:09:32: ==================================================== -2021-11-21 14:09:33: -------------------AdGuard DNS规则 version 2021-11-21T12:07:42.648Z -2021-11-21 14:09:33: -------------------Antiad规则 version 20211120024124 -2021-11-21 14:09:33: -------------------坂本ADgk规则 version 20211120183731 -2021-11-21 14:09:33: -------------------Yhosts规则 version 202111082343 -2021-11-21 14:09:33: -------------------StevenBlack规则 version 18 November 2021 03:49:14 -2021-11-21 14:09:33: -------------------静态规则 version 2021-10-07 18:00 -2021-11-21 14:09:33: ------------------- 内置规则更新成功！ ------------------- -2021-11-21 14:09:33: ------------------- 规则更新成功！ ------------------- +2021-11-21 23:58:49: ------------------- 规则更新 ----------------------- +2021-11-21 23:58:49: ==================================================== +2021-11-21 23:58:49: 开始更新koolproxy的规则，请等待... +2021-11-21 23:58:50: --------------------------------------------------------------------------------------- +2021-11-21 23:58:50: Yhosts规则本地版本号： 202111082343 +2021-11-21 23:58:50: Yhosts规则在线版本号： 202111082343 +2021-11-21 23:58:50: 检测到Yhosts本地版本号和在线版本号相同，那还更新个毛啊! +2021-11-21 23:58:50: --------------------------------------------------------------------------------------- +2021-11-21 23:58:50: Antiad规则本地版本号： 20211120024124 +2021-11-21 23:58:50: Antiad规则在线版本号： 20211120024124 +2021-11-21 23:58:50: 检测到 Antiad规则 本地版本号和在线版本号相同，那还更新个毛啊! +2021-11-21 23:58:50: --------------------------------------------------------------------------------------- +2021-11-21 23:58:50: StevenBlack规则本地版本号： 18 November 2021 03:49:14 +2021-11-21 23:58:50: StevenBlack规则在线版本号： 21 November 2021 16:22:17 +2021-11-21 23:58:50: 检测到新版本 StevenBlack规则 列表，开始更新... +2021-11-21 23:58:50: 将临时文件覆盖到原始 StevenBlack规则 文件 +2021-11-21 23:58:50: --------------------------------------------------------------------------------------- +2021-11-21 23:58:50: AdGuard DNS规则本地版本号： 2021-11-21T12:07:42.648Z +2021-11-21 23:58:50: AdGuard DNS规则在线版本号： 2021-11-21T18:04:54.395Z +2021-11-21 23:58:50: 检测到新版本 AdGuard DNS规则 列表，开始更新... +2021-11-21 23:58:50: 将临时文件覆盖到原始 AdGuard DNS规则 文件 +2021-11-21 23:58:50: --------------------------------------------------------------------------------------- +2021-11-21 23:58:50: ADgk规则本地版本号： 20211120183731 +2021-11-21 23:58:50: ADgk规则在线版本号： 20211120183731 +2021-11-21 23:58:50: 检测到 ADgk规则 本地版本号和在线版本号相同，那还更新个毛啊! +2021-11-21 23:58:50: 跳过优化 补充规则Yhosts。。。。。 +2021-11-21 23:58:50: 跳过优化 补充规则Antiad。。。。。 +2021-11-21 23:58:50: 正在优化 补充规则steven。。。。。 +2021-11-21 23:58:51: 正在优化 补充规则AdGuard DNS。。。。。 +2021-11-21 23:58:58: 跳过优化 ADgk规则。。。。。 +2021-11-21 23:58:58: 所有规则更新并优化完毕！ +2021-11-21 23:58:58: ==================================================== +2021-11-21 23:58:59: -------------------AdGuard DNS规则 version 2021-11-21T18:04:54.395Z +2021-11-21 23:58:59: -------------------Antiad规则 version 20211120024124 +2021-11-21 23:58:59: -------------------坂本ADgk规则 version 20211120183731 +2021-11-21 23:58:59: -------------------Yhosts规则 version 202111082343 +2021-11-21 23:58:59: -------------------StevenBlack规则 version 21 November 2021 16:22:17 +2021-11-21 23:58:59: -------------------静态规则 version 2021-10-07 18:00 +2021-11-21 23:58:59: ------------------- 内置规则更新成功！ ------------------- +2021-11-21 23:58:59: ------------------- 规则更新成功！ ------------------- diff --git a/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js b/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js index 021a290c1..aa1696e17 100644 --- a/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js +++ b/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js @@ -19,13 +19,13 @@ return view.extend({ render: function(data) { var m, s, o; - var has_wifi = false; m = new form.Map('wizard', [_('Inital Router Setup')], _('If you are using this router for the first time, please configure it here.')); s = m.section(form.NamedSection, 'default', 'wizard'); s.addremove = false; + s.tab('wansetup', _('Wan Settings'), _('Three different ways to access the Internet, please choose according to your own situation.')); s.tab('lansetup', _('Lan Settings')); o = s.taboption('wansetup', form.ListValue, 'wan_proto', _('Protocol')); @@ -61,15 +61,6 @@ return view.extend({ o.datatype = 'ip4addr'; o.cast = 'string'; - if (has_wifi) { - o = s.taboption('wifisetup', form.Value, 'wifi_ssid', _('ESSID')); - o.datatype = 'maxlength(32)'; - - o = s.taboption("wifisetup", form.Value, "wifi_key", _("Key")); - o.datatype = 'wpakey'; - o.password = true; - } - o = s.taboption('lansetup', form.Value, 'lan_ipaddr', _('IPv4 address')); o.datatype = 'ip4addr';