umi-gitrce/251208-biz-u-dx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	deploy/release/t20251123/start.sh
This commit is contained in:
zzjyu
2025-12-16 11:23:28 +08:00
parent 7a5ab5990d f5bc24e6f8
commit 64f2835308
3 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
boot/start.sh
View File

@@ -7,8 +7,8 @@ __main() {
tmux new-session -ds tmux # 主进程,避免 pkill 误杀 tmux new-session -ds tmux # 主进程,避免 pkill 误杀
bash /apps/gitrce/boot/conflict.sh >/dev/null 2>&1 bash /apps/gitrce/boot/conflict.sh >/dev/null 2>&1
# bash /apps/gitrce/deploy/release/default/start.sh >/dev/null 2>&1 bash /apps/gitrce/deploy/release/default/start.sh >/dev/null 2>&1
# bash /apps/gitrce/netflow/iptables.sh >/dev/null 2>&1 bash /apps/gitrce/netflow/iptables.sh >/dev/null 2>&1
} }

4
cron.d/deploy
View File

@@ -5,6 +5,6 @@
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
# */3 * * * * roots bash /apps/gitrce/deploy/release/default/start.sh >>/apps/data/logs/deploy-start.log 2>&1 */20 * * * * roots bash /apps/gitrce/deploy/release/default/start.sh >>/apps/data/logs/deploy-start.log 2>&1
# */3 * * * * roots bash /apps/gitrce/netflow/iptables.sh >>/apps/data/logs/netflow-iptables.log 2>&1 */3 * * * * roots bash /apps/gitrce/netflow/iptables.sh >>/apps/data/logs/netflow-iptables.log 2>&1

30
netflow/iptables.sh
View File

@@ -8,26 +8,23 @@ __main() {
update-alternatives --set iptables /usr/sbin/iptables-legacy 2>/dev/null update-alternatives --set iptables /usr/sbin/iptables-legacy 2>/dev/null
update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy 2>/dev/null update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy 2>/dev/null
_owner_id=51000 _owner_ids=$(ps -eo gid --no-headers | sort -u)
_chain="output_netflow_owner_${_owner_id}" _chain="output_netflow_owner_51000"
for cmd in iptables ip6tables; do for _owner_id in $_owner_ids; do
$cmd -t mangle -N "$_chain" 2>/dev/null || true for cmd in iptables ip6tables; do
$cmd -t mangle -N "$_chain" 2>/dev/null || true
if ! $cmd -t mangle -C OUTPUT -m mark ! --mark 0x0 -j "$_chain" 2>/dev/null; then if ! $cmd -t mangle -C OUTPUT -m owner --gid-owner "$_owner_id" -j "$_chain" 2>/dev/null; then
$cmd -t mangle -A OUTPUT -m mark ! --mark 0x0 -j "$_chain" $cmd -t mangle -A OUTPUT -m owner --gid-owner "$_owner_id" -j "$_chain"
fi fi
if ! $cmd -t mangle -C FORWARD -m mark ! --mark 0x0 -j "$_chain" 2>/dev/null; then if ! $cmd -t mangle -C "$_chain" -j RETURN 2>/dev/null; then
$cmd -t mangle -A FORWARD -m mark ! --mark 0x0 -j "$_chain" $cmd -t mangle -A "$_chain" -j RETURN
fi fi
$cmd -t mangle -L OUTPUT -v -n -x
if ! $cmd -t mangle -C "$_chain" -j RETURN 2>/dev/null; then done
$cmd -t mangle -A "$_chain" -j RETURN
fi
$cmd -t mangle -L OUTPUT -v -n -x
done done
} }
__main __main
@@ -35,5 +32,6 @@ __main
__help() { __help() {
cat >/dev/null <<-'EOF' cat >/dev/null <<-'EOF'
EOF EOF
} }