chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2026-01-12 04:39:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

modules.services.{xray,nginx}: fix

Browse Source
This commit is contained in:
陈浩南
2025-04-23 16:12:19 +08:00
parent d4fed10ca5
commit 5eabc6d809
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/services/nginx/default.nix
View File

@@ -346,8 +346,8 @@ inputs:
chain output {
type route hook output priority mangle; policy accept;
meta skgid ${builtins.toString inputs.config.users.groups.nginx.gid} fib saddr type != local \
ct state new ct mark set 2
ct mark 2 ct direction reply meta mark set 2
ct state new counter ct mark set ct mark | 2
ct mark & 2 == 2 ct direction reply counter meta mark set meta mark | 2
return
}
}

19
modules/services/xray.nix
View File

@@ -261,31 +261,32 @@ inputs:
meta l4proto != { tcp, udp } counter return
# 对于目标地址为本机的新建的流，标记并永不代理
fib daddr type local ct state new counter ct mark set 1 return
ct mark 1 counter return
fib daddr type local ct state new counter ct mark set ct mark | 1 return
ct mark & 1 == 1 counter return
ip saddr @noproxy_src_net return
ip daddr @noproxy_net return
ip saddr != 172.16.0.0/12 ip daddr @xmu_net meta l4proto { tcp, udp } \
tproxy ip to :${xmuPort} meta mark set 1
ip daddr @proxy_net meta l4proto { tcp, udp } tproxy ip to :${proxyPort} meta mark set 1
tproxy ip to :${xmuPort} meta mark set meta mark | 1
ip daddr @proxy_net meta l4proto { tcp, udp } tproxy ip to :${proxyPort} \
meta mark set meta mark | 1
ip daddr @lo_net return
meta l4proto { tcp, udp } tproxy ip to :${autoPort} meta mark set 1
meta l4proto { tcp, udp } tproxy ip to :${autoPort} meta mark set meta mark | 1
return
}
chain output {
type route hook output priority mangle; policy accept;
ct mark 1 counter return
ct mark & 1 == 1 counter return
meta skuid { ${noproxyUserStr} } return
ip saddr @noproxy_src_net return
ip daddr @noproxy_net return
ip daddr @xmu_net meta mark set 1
ip daddr @proxy_net meta mark set 1
ip daddr @xmu_net meta mark set meta mark | 1
ip daddr @proxy_net meta mark set meta mark | 1
ip daddr @lo_net return
meta l4proto { tcp, udp } meta mark set 1
meta l4proto { tcp, udp } meta mark set meta mark | 1
return
}