Merge branch 'master' of git.mycard.moe:mycard/network

config-with-proxy.sh

 #!/bin/bash
-LADDER="water"
+LADDER="jue"
 ssh root@10.198.1.1 -p 55322 ipset add u_${LADDER}_oversea 10.198.1.57
-ssh nanahira@10.198.0.6 sudo ipset add u_${LADDER}_oversea 10.198.1.57
+#ssh nanahira@10.198.0.6 sudo ipset add u_${LADDER}_oversea 10.198.1.57
 ./config.sh
 ssh root@10.198.1.1 -p 55322 ipset del u_${LADDER}_oversea 10.198.1.57
-ssh nanahira@10.198.0.6 sudo ipset del u_${LADDER}_oversea 10.198.1.57
+#ssh nanahira@10.198.0.6 sudo ipset del u_${LADDER}_oversea 10.198.1.57

config.sh

@@ -9,3 +9,7 @@ do
     echo "https://docs.google.com/spreadsheets/d/${doc}/export?exportFormat=csv&gid=${sheet}"
 done ) | wget -4 --content-disposition -i -
 cd ..
+
+cd lists
+./run.sh
+cd ..

remove-interface.sh

@@ -4,6 +4,6 @@ COMMAND="flush interface ${INTERFACE}\nquit"
 COMMAND_BASE64=$(echo -e "$COMMAND" | base64 -w 0)
 
 cd ansible
-ansible wg -m shell -a "echo $COMMAND_BASE64 | base64 --decode | timeout 1 nc ::1 33123"
+ansible wg -m shell -b -a "wg-quick down ${INTERFACE} ; echo $COMMAND_BASE64 | base64 --decode | timeout 1 nc ::1 33123"
 ansible wg -m systemd -b -a "name=wg-quick@${INTERFACE} state=stopped enabled=false"
 cd ..

update.sh

@@ -6,9 +6,9 @@ set -e
 
 #read -p '确认无误后按回车继续'
 
-cd lists
-./run.sh
-cd ..
+#cd lists
+#./run.sh
+#cd ..
 
 mkdir -p result
 npm run build