diff --git a/.github/workflows/build-net.yml b/.github/workflows/build-net.yml index 3eafe809..38277192 100644 --- a/.github/workflows/build-net.yml +++ b/.github/workflows/build-net.yml @@ -46,7 +46,7 @@ jobs: run: rm target/* - name: Rebuild target branch run: | - ./netgen.py ref2/china_ip_list.txt.txt -o target/china4.txt + ./netgen.py ref2/china_ip_list.txt -o target/china4.txt ./netgen.py ref1/china6.txt -o target/china6.txt ./netgen.py ref1/chinanet.txt -o target/telecom4.txt @@ -58,13 +58,13 @@ jobs: ./netgen.py ref1/cmcc.txt -o target/cmcc4.txt ./netgen.py ref1/cmcc6.txt -o target/cmcc6.txt - ./netgen.py ref2/china_ip_list.txt.txt -e ref1/chinanet.txt ref1/unicom.txt -o target/chinae2v4.txt + ./netgen.py ref2/china_ip_list.txt -e ref1/chinanet.txt ref1/unicom.txt -o target/chinae2v4.txt ./netgen.py ref1/china6.txt -e ref1/chinanet6.txt ref1/unicom6.txt -o target/chinae2v6.txt - ./netgen.py ref2/china_ip_list.txt.txt -e ref1/chinanet.txt ref1/unicom.txt ref1/cmcc.txt -o target/chinae3v4.txt + ./netgen.py ref2/china_ip_list.txt -e ref1/chinanet.txt ref1/unicom.txt ref1/cmcc.txt -o target/chinae3v4.txt ./netgen.py ref1/china6.txt -e ref1/chinanet6.txt ref1/unicom6.txt ref1/cmcc6.txt -o target/chinae3v6.txt - ./netgen.py 0.0.0.0/0 -e private4.txt ref2/china_ip_list.txt.txt -o target/foreign4.txt + ./netgen.py 0.0.0.0/0 -e private4.txt ref2/china_ip_list.txt -o target/foreign4.txt ./netgen.py ::/0 -e private6.txt ref1/china6.txt -o target/foreign6.txt ./netgen.py private4.txt -o target/private4.txt diff --git a/.github/workflows/build-ros-list.yml b/.github/workflows/build-ros-list.yml index b1b4c7bb..e619e311 100644 --- a/.github/workflows/build-ros-list.yml +++ b/.github/workflows/build-ros-list.yml @@ -48,7 +48,7 @@ jobs: run: | echo $'/ip firewall address-list/n' > target/china4.txt echo $'/ipv6 firewall address-list/n' > target/china6.txt - ./netgen.py ref2/china_ip_list.txt.txt -o target/china4.txt -p 'add address=' -s $'comment="" disabled=no list=China' + ./netgen.py ref2/china_ip_list.txt -o target/china4.txt -p 'add address=' -s $'comment="" disabled=no list=China' ./netgen.py ref1/china6.txt -o target/china6.txt -p 'add address=' -s $'comment="" disabled=no list=China' echo $'/ip firewall address-list/n' > target/telecom4.txt @@ -68,17 +68,17 @@ jobs: echo $'/ip firewall address-list/n' > target/chinae2v4.txt echo $'/ipv6 firewall address-list/n' > target/chinae2v6.txt - ./netgen.py ref2/china_ip_list.txt.txt -e ref1/chinanet.txt ref1/unicom.txt -o target/chinae2v4.txt -p 'add address=' -s $'comment="" disabled=no list=ChinaE2' + ./netgen.py ref2/china_ip_list.txt -e ref1/chinanet.txt ref1/unicom.txt -o target/chinae2v4.txt -p 'add address=' -s $'comment="" disabled=no list=ChinaE2' ./netgen.py ref1/china6.txt -e ref1/chinanet6.txt ref1/unicom6.txt -o target/chinae2v6.txt -p 'add address=' -s $'comment="" disabled=no list=ChinaE2' echo $'/ip firewall address-list/n' > target/chinae3v4.txt echo $'/ipv6 firewall address-list/n' > target/chinae3v6.txt - ./netgen.py ref2/china_ip_list.txt.txt -e ref1/chinanet.txt ref1/unicom.txt ref1/cmcc.txt -o target/chinae3v4.txt -p 'add address=' -s $'comment="" disabled=no list=ChinaE3' + ./netgen.py ref2/china_ip_list.txt -e ref1/chinanet.txt ref1/unicom.txt ref1/cmcc.txt -o target/chinae3v4.txt -p 'add address=' -s $'comment="" disabled=no list=ChinaE3' ./netgen.py ref1/china6.txt -e ref1/chinanet6.txt ref1/unicom6.txt ref1/cmcc6.txt -o target/chinae3v6.txt -p 'add address=' -s $'comment="" disabled=no list=ChinaE3' echo $'/ip firewall address-list/n' > target/foreign4.txt echo $'/ipv6 firewall address-list/n' > target/foreign6.txt - ./netgen.py 0.0.0.0/0 -e private4.txt ref2/china_ip_list.txt.txt -o target/foreign4.txt -p 'add address=' -s $'comment="" disabled=no list=Foreign' + ./netgen.py 0.0.0.0/0 -e private4.txt ref2/china_ip_list.txt -o target/foreign4.txt -p 'add address=' -s $'comment="" disabled=no list=Foreign' ./netgen.py ::/0 -e private6.txt ref1/china6.txt -o target/foreign6.txt -p 'add address=' -s $'comment="" disabled=no list=Foreign' echo $'/ip firewall address-list/n' > target/private4.txt diff --git a/.github/workflows/build-sha.yml b/.github/workflows/build-sha.yml index f6c7506a..3e821738 100644 --- a/.github/workflows/build-sha.yml +++ b/.github/workflows/build-sha.yml @@ -57,7 +57,7 @@ jobs: echo 'ip route add 128.0.0.0/1 dev wgcf || true' >> target/wgcf-up.sh echo 'ip route add ::/1 dev wgcf || true' >> target/wgcf-up.sh echo 'ip route add 8000::/1 dev wgcf || true' >> target/wgcf-up.sh - ./netgen.py ref2/china_ip_list.txt.txt -o target/wgcf-up.sh -p 'ip route add ' -s $' dev eth0 via 10.11.0.1 || true\n' + ./netgen.py ref2/china_ip_list.txt -o target/wgcf-up.sh -p 'ip route add ' -s $' dev eth0 via 10.11.0.1 || true\n' ./netgen.py ref1/china6.txt -o target/wgcf-up.sh -p 'ip route add ' -s $' dev eth0 via fe80::6a77:24ff:fed6:809d || true\n' ./netgen.py private4.txt -o target/wgcf-up.sh -p 'ip route add ' -s $' dev eth0 via 10.11.0.1 || true\n' ./netgen.py private6.txt -o target/wgcf-up.sh -p 'ip route add ' -s $' dev eth0 via fe80::6a77:24ff:fed6:809d || true\n' @@ -72,7 +72,7 @@ jobs: echo 'ip route del 128.0.0.0/1 dev wgcf || true' >> target/wgcf-down.sh echo 'ip route del ::/1 dev wgcf || true' >> target/wgcf-down.sh echo 'ip route del 8000::/1 dev wgcf || true' >> target/wgcf-down.sh - ./netgen.py ref2/china_ip_list.txt.txt -o target/wgcf-down.sh -p 'ip route del ' -s $' dev eth0 via 10.11.0.1 || true\n' + ./netgen.py ref2/china_ip_list.txt -o target/wgcf-down.sh -p 'ip route del ' -s $' dev eth0 via 10.11.0.1 || true\n' ./netgen.py ref1/china6.txt -o target/wgcf-down.sh -p 'ip route del ' -s $' dev eth0 via fe80::6a77:24ff:fed6:809d || true\n' ./netgen.py private4.txt -o target/wgcf-up.sh -p 'ip route del ' -s $' dev eth0 via 10.11.0.1 || true\n' ./netgen.py private6.txt -o target/wgcf-up.sh -p 'ip route del ' -s $' dev eth0 via fe80::6a77:24ff:fed6:809d || true\n'