From bbfcb1eb7fd31bf0353e6bbbfcf63c1434002139 Mon Sep 17 00:00:00 2001 From: darkclip Date: Tue, 2 Jan 2024 04:00:32 +0800 Subject: [PATCH] update --- .github/workflows/build-sha.yml | 2 +- cf-watch.sh => wg-watch.sh | 4 ++-- chgwgpeer => wgpeer | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename cf-watch.sh => wg-watch.sh (97%) rename chgwgpeer => wgpeer (100%) diff --git a/.github/workflows/build-sha.yml b/.github/workflows/build-sha.yml index cfc3e712..4de1c260 100644 --- a/.github/workflows/build-sha.yml +++ b/.github/workflows/build-sha.yml @@ -80,7 +80,7 @@ jobs: ./netgen.py ref1/china6.txt -o target/wgcf-down.sh -p 'ip route del ' -s ' dev eth0 via fe80::6a77:24ff:fed6:809d || true' ./netgen.py private4.txt -o target/wgcf-down.sh -p 'ip route del ' -s ' dev eth0 via 10.11.0.1 || true' ./netgen.py private6.txt -o target/wgcf-down.sh -p 'ip route del ' -s ' dev eth0 via fe80::6a77:24ff:fed6:809d || true' - cp cf-watch.sh target/ + cp wg-watch.sh target/ cd target chmod +x *.sh tar -cf sha.tar *.sh diff --git a/cf-watch.sh b/wg-watch.sh similarity index 97% rename from cf-watch.sh rename to wg-watch.sh index 72119af6..d6f2eea8 100755 --- a/cf-watch.sh +++ b/wg-watch.sh @@ -206,8 +206,8 @@ main(){ fi; endpoint=$(wg show $INTERFACE endpoints | awk '{print $2}'); if [ "$(uname -i)" = 'pfSense' ]; then - if [ $(pfSsh.php playback chgwgpeer $CONFIG) != $endpoint ]; then - pfSsh.php playback chgwgpeer $CONFIG $(echo $endpoint|awk -F: '{print $1}') $(echo $endpoint|awk -F: '{print $2}') || true; + if [ $(pfSsh.php playback wgpeer $CONFIG) != $endpoint ]; then + pfSsh.php playback wgpeer $CONFIG $(echo $endpoint|awk -F: '{print $1}') $(echo $endpoint|awk -F: '{print $2}') || true; fi; else sed -i -r 's/Endpoint =.*/Endpoint = '$endpoint'/' $CONFIG diff --git a/chgwgpeer b/wgpeer similarity index 100% rename from chgwgpeer rename to wgpeer