From fb0840d60627713b168fae1450c6752cc7ae1db6 Mon Sep 17 00:00:00 2001 From: Kiritow <1362050620@qq.com> Date: Sat, 31 Jul 2021 08:30:32 +0000 Subject: [PATCH] Add reload script --- .gitignore | 1 + create.sh | 3 +++ quick_create_client.sh | 3 +++ tool_generate.py | 26 ++++++++++++++++++-------- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index b40147e..603cbd2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ __pycache__/ start.sh stop.sh restart.sh +reload.sh diff --git a/create.sh b/create.sh index 3735cc4..0d1eebc 100755 --- a/create.sh +++ b/create.sh @@ -6,9 +6,12 @@ export WG_PUBLICIP=$(curl ident.me) export WG_MYPRIK=$(wg genkey) export WG_MYPUBK=$(echo $WG_MYPRIK | wg pubkey) +export TMUX_PATH=$(which tmux) + python3 tool_create.py python3 tool_generate.py chmod +x start.sh chmod +x stop.sh chmod +x restart.sh +chmod +x reload.sh diff --git a/quick_create_client.sh b/quick_create_client.sh index 28f5ad4..8d640e6 100755 --- a/quick_create_client.sh +++ b/quick_create_client.sh @@ -3,9 +3,12 @@ export WG_MYPRIK=$(wg genkey) export WG_MYPUBK=$(echo $WG_MYPRIK | wg pubkey) +export TMUX_PATH=$(which tmux) + python3 tool_quick_client.py python3 tool_generate.py chmod +x start.sh chmod +x stop.sh chmod +x restart.sh +chmod +x reload.sh diff --git a/tool_generate.py b/tool_generate.py index 8d861d9..b4bce82 100644 --- a/tool_generate.py +++ b/tool_generate.py @@ -21,6 +21,8 @@ def write_tunnel_config(mode, listen_addr, remote_addr, password): return filename +tmux_path = os.getenv("TMUX_PATH") + config = load_config() if not config: logger.error("No valid config found.") @@ -46,10 +48,10 @@ MTU = {} '''.format(config["ip"], config["prikey"], config["listen"], config["mtu"])) # Generate PostUp - f.write('''PostUp=/bin/tmux new-session -s tunnel -d 'watch -n 1 --color WG_COLOR_MODE=always wg' + f.write('''PostUp={} new-session -s tunnel -d 'watch -n 1 --color WG_COLOR_MODE=always wg' PostUp=sysctl net.core.default_qdisc=fq PostUp=sysctl net.ipv4.tcp_congestion_control=bbr -''') +'''.format(tmux_path)) if op_mode in ("s", "m"): f.write("PostUp=sysctl net.ipv4.ip_forward=1\n") @@ -62,29 +64,29 @@ PostUp=sysctl net.ipv4.tcp_congestion_control=bbr if info["speeder"]["enable"]: # WG --> Speeder --> RawTunnel speeder = info["speeder"] - f.write('''PostUp=/bin/tmux new-window -t tunnel -d '{} -c -l127.0.0.1:{} -r 127.0.0.1:{} -f{} --mode 0' \n'''.format(path_speeder, speeder["port"], info["port"], speeder["ratio"])) + f.write('''PostUp={} new-window -t tunnel -d '{} -c -l127.0.0.1:{} -r 127.0.0.1:{} -f{} --mode 0' \n'''.format(tmux_path, path_speeder, speeder["port"], info["port"], speeder["ratio"])) filename = write_tunnel_config("c", "127.0.0.1:{}".format(info["port"]), info["remote"], info["password"]) filepath = os.path.join(current_dir, "local", "tunnel", filename) - f.write('''PostUp=/bin/tmux new-window -t tunnel -d '{} --conf-file {}' \n'''.format(path_tunnel, filepath)) + f.write('''PostUp={} new-window -t tunnel -d '{} --conf-file {}' \n'''.format(tmux_path, path_tunnel, filepath)) for info in udp_servers: if info["speeder"]["enable"]: # RawTunnel --> Speeder --> WG speeder = info["speeder"] - f.write('''PostUp=/bin/tmux new-window -t tunnel -d '{} -s -l127.0.0.1:{} -r 127.0.0.1:{} -f{} --mode 0' \n'''.format(path_speeder, speeder["port"], config["listen"], speeder["ratio"])) + f.write('''PostUp={} new-window -t tunnel -d '{} -s -l127.0.0.1:{} -r 127.0.0.1:{} -f{} --mode 0' \n'''.format(tmux_path, path_speeder, speeder["port"], config["listen"], speeder["ratio"])) filename = write_tunnel_config("s", "0.0.0.0:{}".format(info["port"]), "127.0.0.1:{}".format(speeder["port"]), info["password"]) filepath = os.path.join(current_dir, "local", "tunnel", filename) - f.write('''PostUp=/bin/tmux new-window -t tunnel -d '{} --conf-file {}' \n'''.format(path_tunnel, filepath)) + f.write('''PostUp={} new-window -t tunnel -d '{} --conf-file {}' \n'''.format(tmux_path, path_tunnel, filepath)) else: # RawTunnel --> WG filename = write_tunnel_config("s", "0.0.0.0:{}".format(info["port"]), "127.0.0.1:{}".format(config["listen"]), info["password"]) filepath = os.path.join(current_dir, "local", "tunnel", filename) - f.write('''PostUp=/bin/tmux new-window -t tunnel -d '{} --conf-file {}' \n'''.format(path_tunnel, filepath)) + f.write('''PostUp={} new-window -t tunnel -d '{} --conf-file {}' \n'''.format(tmux_path, path_tunnel, filepath)) # Generate PostDown - f.write("PostDown=/bin/tmux kill-session -t tunnel\n") + f.write("PostDown={} kill-session -t tunnel\n".format(tmux_path)) for info in config["peers"]: f.write(''' @@ -132,6 +134,14 @@ set -x ./start.sh ''') +logger.info("Generate reload script...") +with open("reload.sh", "w", encoding='utf-8') as f: + f.write('''#!/bin/bash +set -x +sudo cp local/{}.conf /etc/wireguard/ +sudo wg syncconf {} <(wg-quick strip {}) +'''.format(config["interface"], config["interface"], config["interface"])) + logger.info('''[Done] Config generated. Before you run start.sh, besure to: 1. Disable SSH Server password login.