[PR #21] Sync develop from ha-harbor-ws/os-xray #19

Open
opened 2026-10-31 21:01:51 +00:00 by bsakaguchi · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/MrTheory/os-xray/pull/21
Author: @ha-harbor-ws
Created: 10/17/2026
Status: 🔄 Open

Base: develop ← Head: develop


📝 Commits (10+)

  • ad8d8b6 Add TUN IPv6 from OPNsense config and xray DNS with UseIPv4.
  • 0d00c9c Point docs and installer to ha-harbor-ws feature branch.
  • f745ffb Add per-instance IP stack toggles and DNS servers field.
  • c8a9890 Decouple TUN IPv6 assignment from instance routing flags.
  • c8db098 Fix tun2socks start when TUN interface already exists.
  • 9af2437 Destroy TUN and cleanup files when instance is deleted.
  • 8226ce5 Fix invalid routing domainStrategy that blocked config start.
  • a8cd954 Align TUN lifecycle with upstream: no destroy on stop.
  • 310e315 Use IPOnDemand domainStrategy for single-stack instances.
  • 4bddb9f Set outbound domainStrategy UseIPv4/UseIPv6 for single-stack.

📊 Changes

79 files changed (+20796 additions, -1786 deletions)

View changed files

➕ .cursor/rules/opnsense-help.mdc (+15 -0)
📝 Changelog.md (+74 -1)
📝 README.md (+231 -736)
📝 README.ru.md (+229 -733)
➕ bgp.conf (+2 -0)
➕ bird.conf (+47 -0)
➕ bird/communities.inc (+2 -0)
➕ bird/community_ANTIFILTER_DOWNLOAD.inc (+1 -0)
➕ bird/community_ANTIFILTER_NETWORK.inc (+1 -0)
➕ bird/filter_antifilter_download.inc (+8 -0)
➕ bird/filter_antifilter_network_v4.inc (+8 -0)
➕ bird/filter_antifilter_network_v6.inc (+8 -0)
➕ bird/filter_refilter.inc (+5 -0)
➕ bird/filters.inc (+2 -0)
➕ bird/peer_antifilter_download.inc (+11 -0)
➕ bird/peer_antifilter_network.inc (+15 -0)
➕ bird/peer_refilter.inc (+11 -0)
➕ bird/router_id.inc (+2 -0)
📝 install.sh (+1924 -38)
📝 plugin/etc/inc/plugins.inc.d/xray.inc (+50 -39)

...and 59 more files

📄 Description

Summary

Test plan

  • Review diff vs MrTheory develop
  • Smoke-test install on OPNsense after merge

Made with Cursor


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/MrTheory/os-xray/pull/21 **Author:** [@ha-harbor-ws](https://github.com/ha-harbor-ws) **Created:** 10/17/2026 **Status:** 🔄 Open **Base:** `develop` ← **Head:** `develop` --- ### 📝 Commits (10+) - [`ad8d8b6`](https://github.com/MrTheory/os-xray/commit/ad8d8b6cd496d2b6190b5c096c39ea84a70ae0eb) Add TUN IPv6 from OPNsense config and xray DNS with UseIPv4. - [`0d00c9c`](https://github.com/MrTheory/os-xray/commit/0d00c9ca8284c757b20c65f5b745330114fc857b) Point docs and installer to ha-harbor-ws feature branch. - [`f745ffb`](https://github.com/MrTheory/os-xray/commit/f745ffbfa673f5e1d5272a75b500ff0cc67bc634) Add per-instance IP stack toggles and DNS servers field. - [`c8a9890`](https://github.com/MrTheory/os-xray/commit/c8a9890569f59e6036af883a7bb10b0073308d44) Decouple TUN IPv6 assignment from instance routing flags. - [`c8db098`](https://github.com/MrTheory/os-xray/commit/c8db098aa3bab889ced80e7e30ca8d789a870c1a) Fix tun2socks start when TUN interface already exists. - [`9af2437`](https://github.com/MrTheory/os-xray/commit/9af2437323c4e5719b8924bf76b98e181e849f3c) Destroy TUN and cleanup files when instance is deleted. - [`8226ce5`](https://github.com/MrTheory/os-xray/commit/8226ce5e169403535e88ede8c2a2790c3fbdd3f3) Fix invalid routing domainStrategy that blocked config start. - [`a8cd954`](https://github.com/MrTheory/os-xray/commit/a8cd9542f54a6d4989d8d465b51863cc66f7a5b5) Align TUN lifecycle with upstream: no destroy on stop. - [`310e315`](https://github.com/MrTheory/os-xray/commit/310e315f57c891a86c6edf44abd7bffbe0366c69) Use IPOnDemand domainStrategy for single-stack instances. - [`4bddb9f`](https://github.com/MrTheory/os-xray/commit/4bddb9f5b0c298dd12f5f48d70fa228496fc8817) Set outbound domainStrategy UseIPv4/UseIPv6 for single-stack. ### 📊 Changes **79 files changed** (+20796 additions, -1786 deletions) <details> <summary>View changed files</summary> ➕ `.cursor/rules/opnsense-help.mdc` (+15 -0) 📝 `Changelog.md` (+74 -1) 📝 `README.md` (+231 -736) 📝 `README.ru.md` (+229 -733) ➕ `bgp.conf` (+2 -0) ➕ `bird.conf` (+47 -0) ➕ `bird/communities.inc` (+2 -0) ➕ `bird/community_ANTIFILTER_DOWNLOAD.inc` (+1 -0) ➕ `bird/community_ANTIFILTER_NETWORK.inc` (+1 -0) ➕ `bird/filter_antifilter_download.inc` (+8 -0) ➕ `bird/filter_antifilter_network_v4.inc` (+8 -0) ➕ `bird/filter_antifilter_network_v6.inc` (+8 -0) ➕ `bird/filter_refilter.inc` (+5 -0) ➕ `bird/filters.inc` (+2 -0) ➕ `bird/peer_antifilter_download.inc` (+11 -0) ➕ `bird/peer_antifilter_network.inc` (+15 -0) ➕ `bird/peer_refilter.inc` (+11 -0) ➕ `bird/router_id.inc` (+2 -0) 📝 `install.sh` (+1924 -38) 📝 `plugin/etc/inc/plugins.inc.d/xray.inc` (+50 -39) _...and 59 more files_ </details> ### 📄 Description ## Summary - Merge all current develop changes from https://github.com/ha-harbor-ws/os-xray into MrTheory/os-xray - Includes BGP/DNStap/Static defaults, gateways/autoroute fixes, README updates ## Test plan - [x] Review diff vs MrTheory develop - [x] Smoke-test install on OPNsense after merge Made with [Cursor](https://cursor.com) --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
Sign in to join this conversation.
No labels
pull-request
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
MrTheory/os-xray#19
No description provided.