Merge pull request #3 from 233boy/master

update
pull/600/head
Blue planet 6 years ago committed by GitHub
commit 7ef13af20b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      config/client/h2.json
  2. 4
      config/client/http.json
  3. 4
      config/client/kcp.json
  4. 4
      config/client/quic.json
  5. 4
      config/client/tcp.json
  6. 4
      config/client/ws.json
  7. 4
      config/client/ws_tls.json
  8. 2
      config/server/dynamic/quic.json
  9. 1
      config/server/quic.json
  10. 4
      install.sh
  11. 7
      src/caddy-config.sh
  12. 10
      src/download-caddy.sh
  13. 6
      v2ray.sh

@ -54,6 +54,10 @@
"network": "tcp,udp",
"timeout": 0,
"followRedirect": true
},
"sniffing": {
"enabled": true,
"destOverride": ["http", "tls"]
}
},
{

@ -84,6 +84,10 @@
"network": "tcp,udp",
"timeout": 0,
"followRedirect": true
},
"sniffing": {
"enabled": true,
"destOverride": ["http", "tls"]
}
},
{

@ -55,6 +55,10 @@
"network": "tcp,udp",
"timeout": 0,
"followRedirect": true
},
"sniffing": {
"enabled": true,
"destOverride": ["http", "tls"]
}
},
{

@ -54,6 +54,10 @@
"network": "tcp,udp",
"timeout": 0,
"followRedirect": true
},
"sniffing": {
"enabled": true,
"destOverride": ["http", "tls"]
}
},
{

@ -44,6 +44,10 @@
"network": "tcp,udp",
"timeout": 0,
"followRedirect": true
},
"sniffing": {
"enabled": true,
"destOverride": ["http", "tls"]
}
},
{

@ -47,6 +47,10 @@
"network": "tcp,udp",
"timeout": 0,
"followRedirect": true
},
"sniffing": {
"enabled": true,
"destOverride": ["http", "tls"]
}
},
{

@ -57,6 +57,10 @@
"network": "tcp,udp",
"timeout": 0,
"followRedirect": true
},
"sniffing": {
"enabled": true,
"destOverride": ["http", "tls"]
}
},
{

@ -23,7 +23,6 @@
"streamSettings": {
"network": "quic",
"quicSettings": {
"security": "aes-128-gcm",
"key": "",
"header": {
"type": "none"
@ -56,7 +55,6 @@
"streamSettings": {
"network": "quic",
"quicSettings": {
"security": "aes-128-gcm",
"key": "",
"header": {
"type": "none"

@ -20,7 +20,6 @@
"streamSettings": {
"network": "quic",
"quicSettings": {
"security": "aes-128-gcm",
"key": "",
"header": {
"type": "none"

@ -745,7 +745,9 @@ domain_check() {
# $cmd install dnsutils -y
# fi
# test_domain=$(dig $domain +short)
test_domain=$(ping $domain -c 1 | grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}")
# test_domain=$(ping $domain -c 1 -4 | grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}")
# test_domain=$(wget -qO- --header='accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1)
test_domain=$(curl -sH 'accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1)
if [[ $test_domain != $ip ]]; then
echo
echo -e "$red 检测域名解析错误....$none"

@ -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}

@ -26,9 +26,13 @@ _install_caddy_service() {
setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/caddy
if [[ $systemd ]]; then
# cp -f ${caddy_tmp}init/linux-systemd/caddy.service /lib/systemd/system/
if ! wget https://raw.githubusercontent.com/caddyserver/caddy/master/dist/init/linux-systemd/caddy.service -O /lib/systemd/system/caddy.service; then
echo -e "$red 下载 caddy.service 失败!$none" && exit 1
cp -f ${caddy_tmp}init/linux-systemd/caddy.service /lib/systemd/system/
# if ! wget https://raw.githubusercontent.com/caddyserver/caddy/master/dist/init/linux-systemd/caddy.service -O /lib/systemd/system/caddy.service; then
# echo -e "$red 下载 caddy.service 失败!$none" && exit 1
# fi
# sed -i "s/-log-timestamps=false//g" /lib/systemd/system/caddy.service
if [[ ! $(grep "ReadWriteDirectories" /lib/systemd/system/caddy.service) ]]; then
sed -i "/ReadWritePaths/a ReadWriteDirectories=/etc/ssl/caddy" /lib/systemd/system/caddy.service
fi
# # sed -i "s/www-data/root/g" /lib/systemd/system/caddy.service
# sed -i "/on-abnormal/a RestartSec=3" /lib/systemd/system/caddy.service

@ -10,7 +10,7 @@ none='\e[0m'
# Root
[[ $(id -u) != 0 ]] && echo -e " 哎呀……请使用 ${red}root ${none}用户运行 ${yellow}~(^_^) ${none}" && exit 1
_version="v3.17"
_version="v3.26"
cmd="apt-get"
@ -1763,7 +1763,9 @@ change_proxy_site_config() {
}
domain_check() {
# test_domain=$(dig $new_domain +short)
test_domain=$(ping $new_domain -c 1 | grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}")
# test_domain=$(ping $new_domain -c 1 -4 | grep -oE -m1 "([0-9]{1,3}\.){3}[0-9]{1,3}")
# test_domain=$(wget -qO- --header='accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$new_domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1)
test_domain=$(curl -sH 'accept: application/dns-json' "https://cloudflare-dns.com/dns-query?name=$new_domain&type=A" | grep -oE "([0-9]{1,3}\.){3}[0-9]{1,3}" | head -1)
if [[ $test_domain != $ip ]]; then
echo
echo -e "$red 检测域名解析错误....$none"

Loading…
Cancel
Save