zhk-gitea/v2ray
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

caddy config add: timeouts none

Browse Source
This commit is contained in:
233boy
2018-04-09 12:09:00 +08:00
parent fd2c9da55d
commit ae922855aa
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install.sh
View File

@@ -739,6 +739,7 @@ caddy_config() {
$domain { $domain {
tls ${email}@gmail.com tls ${email}@gmail.com
gzip gzip
timeouts none
proxy / $proxy_site { proxy / $proxy_site {
without /${ws_path} without /${ws_path}
} }
@@ -752,6 +753,7 @@ $domain {
cat >/etc/caddy/Caddyfile <<-EOF cat >/etc/caddy/Caddyfile <<-EOF
$domain { $domain {
tls ${email}@gmail.com tls ${email}@gmail.com
timeouts none
proxy / 127.0.0.1:${v2ray_port} { proxy / 127.0.0.1:${v2ray_port} {
websocket websocket
} }

9
v2ray.sh
View File

@@ -10,7 +10,7 @@ none='\e[0m'
# Root # Root
[[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1 [[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1
_version="v1.68" _version="v1.69"
cmd="apt-get" cmd="apt-get"
@@ -1368,6 +1368,7 @@ caddy_config() {
$domain { $domain {
tls ${email}@gmail.com tls ${email}@gmail.com
gzip gzip
timeouts none
proxy / $proxy_site { proxy / $proxy_site {
without /${ws_path} without /${ws_path}
} }
@@ -1381,6 +1382,7 @@ $domain {
cat >/etc/caddy/Caddyfile <<-EOF cat >/etc/caddy/Caddyfile <<-EOF
$domain { $domain {
tls ${email}@gmail.com tls ${email}@gmail.com
timeouts none
proxy / 127.0.0.1:${v2ray_port} { proxy / 127.0.0.1:${v2ray_port} {
websocket websocket
} }
@@ -2013,11 +2015,11 @@ blocked_hosts() {
change_v2ray_alterId() { change_v2ray_alterId() {
echo echo
while :; do while :; do
echo -e "请输入 ${yellow}alterId${none} 的数值 [${magenta}1-65535$none]" echo -e "请输入 ${yellow}alterId${none} 的数值 [${magenta}0-65535$none]"
read -p "$(echo -e "(当前数值是: ${cyan}$alterId$none):") " new_alterId read -p "$(echo -e "(当前数值是: ${cyan}$alterId$none):") " new_alterId
[[ -z $new_alterId ]] && error && continue [[ -z $new_alterId ]] && error && continue
case $new_alterId in case $new_alterId in
[1-9] | [1-9][0-9] | [1-9][0-9][0-9] | [1-9][0-9][0-9][0-9] | [1-5][0-9][0-9][0-9][0-9] | 6[0-4][0-9][0-9][0-9] | 65[0-4][0-9][0-9] | 655[0-3][0-5]) 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9] | [1-9][0-9][0-9][0-9] | [1-5][0-9][0-9][0-9][0-9] | 6[0-4][0-9][0-9][0-9] | 65[0-4][0-9][0-9] | 655[0-3][0-5])
echo echo
echo echo
echo -e "$yellow alterId = $cyan$new_alterId$none" echo -e "$yellow alterId = $cyan$new_alterId$none"
@@ -3690,6 +3692,7 @@ restart)
;; ;;
reload) reload)
config config
[[ $v2ray_transport == "4" && $caddy_installed ]] && caddy_config
clear clear
view_v2ray_config_info view_v2ray_config_info
download_v2ray_config_ask download_v2ray_config_ask