From 6288fcfbf18c86cc702e512c11217cf1c3c4a662 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Tue, 29 Oct 2019 12:25:09 +0800 Subject: [PATCH] remove random create caddy email --- src/caddy-config.sh | 7 ++----- v2ray.sh | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/caddy-config.sh b/src/caddy-config.sh index 76c35be..b487bbb 100644 --- a/src/caddy-config.sh +++ b/src/caddy-config.sh @@ -1,10 +1,10 @@ -local email=$(((RANDOM << 22))) +# local email=$(((RANDOM << 22))) +# tls ${email}@gmail.com case $v2ray_transport in 4) if [[ $is_path ]]; then cat >/etc/caddy/Caddyfile <<-EOF $domain { - tls ${email}@gmail.com gzip timeouts none proxy / $proxy_site { @@ -20,7 +20,6 @@ import sites/* else cat >/etc/caddy/Caddyfile <<-EOF $domain { - tls ${email}@gmail.com timeouts none proxy / 127.0.0.1:${v2ray_port} { websocket @@ -34,7 +33,6 @@ import sites/* if [[ $is_path ]]; then cat >/etc/caddy/Caddyfile <<-EOF $domain { - tls ${email}@gmail.com gzip timeouts none proxy / $proxy_site { @@ -51,7 +49,6 @@ import sites/* else cat >/etc/caddy/Caddyfile <<-EOF $domain { - tls ${email}@gmail.com timeouts none proxy / https://127.0.0.1:${v2ray_port} { header_upstream Host {host} diff --git a/v2ray.sh b/v2ray.sh index f45b60c..15bf8a0 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -10,7 +10,7 @@ none='\e[0m' # Root [[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1 -_version="v3.19" +_version="v3.20" cmd="apt-get"