Multiple fixes#1690
Merged
Merged
Conversation
Avoid recurring errors like: E! [inputs.ethtool] Error in plugin: "eth3.835" stats: operation not supported E! [inputs.ethtool] Error in plugin: "pppoe-wan" stats: operation not supported
Avoid errors like: procd: /etc/rc.d/S99snort: Traceback (most recent call last): procd: /etc/rc.d/S99snort: File "/usr/bin/ns-snort-rules", line 195, in <module> procd: /etc/rc.d/S99snort: main() procd: /etc/rc.d/S99snort: ~~~~^^ procd: /etc/rc.d/S99snort: File "/usr/bin/ns-snort-rules", line 178, in main procd: /etc/rc.d/S99snort: rules = filter_official_rules(official_policy, alert_excluded, disabled_rules, oinkcode) procd: /etc/rc.d/S99snort: File "/usr/bin/ns-snort-rules", line 106, in filter_official_rules procd: /etc/rc.d/S99snort: for rule in snort.parse_file(file): procd: /etc/rc.d/S99snort: ~~~~~~~~~~~~~~~~^^^^^^ procd: /etc/rc.d/S99snort: File "/usr/lib/python3.13/site-packages/nethsec/snort/__init__.py", line 375, in parse_file procd: /etc/rc.d/S99snort: FileNotFoundError: [Errno 2] No such file or directory: '/mnt/data/ns-snort/snort-rules/snort3-community-rules/snort3-community.rules'
Merge the builtin adblock catalog into the Threat Shield generated custom feed file so public feeds such as adguard remain available when ts_enabled=1. This restores mixed builtin and Threat Shield DNS feeds after the 8.8 adblock sync without changing the local adblock fork. Assisted-by: Copilot:gpt-5.4
Tbaile
approved these changes
May 26, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes for: