diff --git a/fe-app-tachyon/locales/tachyon.pot b/fe-app-tachyon/locales/tachyon.pot index 70bdbff2..1df1a0f0 100644 --- a/fe-app-tachyon/locales/tachyon.pot +++ b/fe-app-tachyon/locales/tachyon.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: TACHYON\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-16 19:41+0300\n" -"PO-Revision-Date: 2026-09-16 19:41+0300\n" +"POT-Creation-Date: 2026-09-16 19:54+0300\n" +"PO-Revision-Date: 2026-09-16 19:54+0300\n" "Last-Translator: Dushnilin \n" "Language-Team: LANGUAGE \n" "Language: \n" diff --git a/fe-app-tachyon/locales/tachyon.ru.po b/fe-app-tachyon/locales/tachyon.ru.po index 80cdfa18..47173e65 100644 --- a/fe-app-tachyon/locales/tachyon.ru.po +++ b/fe-app-tachyon/locales/tachyon.ru.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: TACHYON\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-16 22:41+0300\n" -"PO-Revision-Date: 2026-09-16 22:41+0300\n" +"POT-Creation-Date: 2026-09-16 22:54+0300\n" +"PO-Revision-Date: 2026-09-16 22:54+0300\n" "Last-Translator: Dushnilin\n" "Language-Team: none\n" "Language: ru\n" diff --git a/luci-app-tachyon/po/ru/tachyon.po b/luci-app-tachyon/po/ru/tachyon.po index 80cdfa18..47173e65 100644 --- a/luci-app-tachyon/po/ru/tachyon.po +++ b/luci-app-tachyon/po/ru/tachyon.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: TACHYON\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-16 22:41+0300\n" -"PO-Revision-Date: 2026-09-16 22:41+0300\n" +"POT-Creation-Date: 2026-09-16 22:54+0300\n" +"PO-Revision-Date: 2026-09-16 22:54+0300\n" "Last-Translator: Dushnilin\n" "Language-Team: none\n" "Language: ru\n" diff --git a/luci-app-tachyon/po/templates/tachyon.pot b/luci-app-tachyon/po/templates/tachyon.pot index 70bdbff2..1df1a0f0 100644 --- a/luci-app-tachyon/po/templates/tachyon.pot +++ b/luci-app-tachyon/po/templates/tachyon.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: TACHYON\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-09-16 19:41+0300\n" -"PO-Revision-Date: 2026-09-16 19:41+0300\n" +"POT-Creation-Date: 2026-09-16 19:54+0300\n" +"PO-Revision-Date: 2026-09-16 19:54+0300\n" "Last-Translator: Dushnilin \n" "Language-Team: LANGUAGE \n" "Language: \n" diff --git a/tachyon/files/usr/lib/service/state.uc b/tachyon/files/usr/lib/service/state.uc index 982aa500..a2a995a3 100644 --- a/tachyon/files/usr/lib/service/state.uc +++ b/tachyon/files/usr/lib/service/state.uc @@ -1253,7 +1253,6 @@ function append_list_update_signature_body(body, section) { body = signature_add_value(body, "lists." + name + ".action", action); if (action == "dns") { body = signature_add_value(body, "lists." + name + ".domain_ip_lists", option(section, "domain_ip_lists", "")); - body = signature_add_value(body, "lists." + name + ".rule_set", connections.rule_sets_value(section)); return body; } if (action == "hosts") { @@ -1271,7 +1270,6 @@ function append_list_update_signature_body(body, section) { body = signature_add_value(body, "lists." + name + ".remote_subnet_lists", option(section, "remote_subnet_lists", "")); body = signature_add_value(body, "lists." + name + ".rule_set_with_subnets", connections.rule_sets_with_subnets_value(section)); body = signature_add_value(body, "lists." + name + ".domain_ip_lists", option(section, "domain_ip_lists", "")); - body = signature_add_value(body, "lists." + name + ".rule_set", connections.rule_sets_value(section)); return body; } diff --git a/tests/config_validator_reference.sh b/tests/config_validator_reference.sh index 9289f450..0f41b399 100644 --- a/tests/config_validator_reference.sh +++ b/tests/config_validator_reference.sh @@ -35,12 +35,12 @@ assert_accepts "empty ruleset reference" ruleset-reference-valid "" "$COMMUNITY_ assert_accepts "community ruleset reference" ruleset-reference-valid telegram "$COMMUNITY_SERVICES" assert_accepts "https ruleset reference" ruleset-reference-valid https://example.com/rule.srs "$COMMUNITY_SERVICES" assert_accepts "extensionless https ruleset reference" ruleset-reference-valid https://example.com/download "$COMMUNITY_SERVICES" -assert_rejects "https plain list as ruleset reference" ruleset-reference-valid https://example.com/list.lst "$COMMUNITY_SERVICES" -assert_rejects "https plain list with query as ruleset reference" ruleset-reference-valid "https://example.com/list.txt?token=1" "$COMMUNITY_SERVICES" +assert_accepts "https plain list as ruleset reference" ruleset-reference-valid https://example.com/list.lst "$COMMUNITY_SERVICES" +assert_accepts "https plain list with query as ruleset reference" ruleset-reference-valid "https://example.com/list.txt?token=1" "$COMMUNITY_SERVICES" assert_accepts "absolute srs ruleset reference" ruleset-reference-valid /tmp/rule.srs "$COMMUNITY_SERVICES" assert_accepts "absolute json ruleset reference" ruleset-reference-valid /tmp/rule.json "$COMMUNITY_SERVICES" assert_rejects "relative ruleset reference" ruleset-reference-valid relative/rule.srs "$COMMUNITY_SERVICES" -assert_rejects "plain list as ruleset reference" ruleset-reference-valid /tmp/rule.lst "$COMMUNITY_SERVICES" +assert_accepts "plain list as ruleset reference" ruleset-reference-valid /tmp/rule.lst "$COMMUNITY_SERVICES" assert_accepts "empty plain list reference" plain-domain-ip-list-reference-valid "" assert_accepts "https plain list reference" plain-domain-ip-list-reference-valid https://example.com/list.lst diff --git a/tests/dns_action_ui.sh b/tests/dns_action_ui.sh index b9cf0032..ebafd72e 100644 --- a/tests/dns_action_ui.sh +++ b/tests/dns_action_ui.sh @@ -42,7 +42,7 @@ if (source.slice(server, requiredIndex('"dns_detour_enabled"', server)).includes for (const expected of [ '_("DNS server used by the resolver")', '_("DNS requests through section")', - '"Add URLs or local paths to .srs / .json lists. Subnets are ignored by default."', + '"Add URLs or local paths to .srs / .json / .lst / .txt lists. Subnets are ignored by default."', '"Add URLs or local paths to .lst lists containing domains. IP entries are ignored."', ]) { requiredIndex(expected);