From f5b943f8b71c3f2eb989c28ff994fc4a1c273a8d Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Sun, 22 Sep 2019 10:30:43 +0800 Subject: [PATCH 01/21] fix caddy cannot running issue --- src/download-caddy.sh | 17 ++++++++++++----- v2ray.sh | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/download-caddy.sh b/src/download-caddy.sh index d9ea475..ef803c2 100644 --- a/src/download-caddy.sh +++ b/src/download-caddy.sh @@ -2,6 +2,9 @@ _download_caddy_file() { caddy_tmp="/tmp/install_caddy/" caddy_tmp_file="/tmp/install_caddy/caddy.tar.gz" [[ -d $caddy_tmp ]] && rm -rf $caddy_tmp + if [[ ! ${caddy_arch} ]]; then + echo -e "$red 获取 Caddy 下载参数失败!$none" && exit 1 + fi local caddy_download_link="https://caddyserver.com/download/linux/${caddy_arch}?license=personal" mkdir -p $caddy_tmp @@ -33,15 +36,19 @@ _install_caddy_service() { update-rc.d -f caddy defaults fi - mkdir -p /etc/ssl/caddy - if [ -z "$(grep www-data /etc/passwd)" ]; then useradd -M -s /usr/sbin/nologin www-data fi - chown -R www-data.www-data /etc/ssl/caddy + # chown -R www-data.www-data /etc/ssl/caddy - mkdir -p /etc/caddy/ + # ref https://github.com/caddyserver/caddy/tree/master/dist/init/linux-systemd + + mkdir -p /etc/caddy + chown -R root:root /etc/caddy + mkdir -p /etc/ssl/caddy + chown -R root:www-data /etc/ssl/caddy + chmod 0770 /etc/ssl/caddy ## create sites dir mkdir -p /etc/caddy/sites -} \ No newline at end of file +} diff --git a/v2ray.sh b/v2ray.sh index a6eea0d..61ceaba 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.13" +_version="v3.14" cmd="apt-get" From 5fbdf869180f8d042257c55f8c49446494b370c8 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Tue, 24 Sep 2019 12:02:45 +0800 Subject: [PATCH 02/21] ...fix caddy running issue. mdzz --- src/download-caddy.sh | 78 +++++++++++++++++++++++++++++-------------- v2ray.sh | 2 +- 2 files changed, 54 insertions(+), 26 deletions(-) diff --git a/src/download-caddy.sh b/src/download-caddy.sh index ef803c2..5191e8d 100644 --- a/src/download-caddy.sh +++ b/src/download-caddy.sh @@ -1,33 +1,61 @@ _download_caddy_file() { - caddy_tmp="/tmp/install_caddy/" - caddy_tmp_file="/tmp/install_caddy/caddy.tar.gz" - [[ -d $caddy_tmp ]] && rm -rf $caddy_tmp - if [[ ! ${caddy_arch} ]]; then - echo -e "$red 获取 Caddy 下载参数失败!$none" && exit 1 - fi - local caddy_download_link="https://caddyserver.com/download/linux/${caddy_arch}?license=personal" + # caddy_tmp="/tmp/install_caddy/" + # caddy_tmp_file="/tmp/install_caddy/caddy.tar.gz" + # [[ -d $caddy_tmp ]] && rm -rf $caddy_tmp + # if [[ ! ${caddy_arch} ]]; then + # echo -e "$red 获取 Caddy 下载参数失败!$none" && exit 1 + # fi + # local caddy_download_link="https://caddyserver.com/download/linux/${caddy_arch}?license=personal" - mkdir -p $caddy_tmp + # mkdir -p $caddy_tmp - if ! wget --no-check-certificate -O "$caddy_tmp_file" $caddy_download_link; then - echo -e "$red 下载 Caddy 失败!$none" && exit 1 - fi + # if ! wget --no-check-certificate -O "$caddy_tmp_file" $caddy_download_link; then + # echo -e "$red 下载 Caddy 失败!$none" && exit 1 + # fi + + # tar zxf $caddy_tmp_file -C $caddy_tmp + # cp -f ${caddy_tmp}caddy /usr/local/bin/ - tar zxf $caddy_tmp_file -C $caddy_tmp - cp -f ${caddy_tmp}caddy /usr/local/bin/ + wget -qO- https://getcaddy.com | bash -s personal if [[ ! -f /usr/local/bin/caddy ]]; then echo -e "$red 安装 Caddy 出错!" && exit 1 fi } _install_caddy_service() { - setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/caddy + # 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/ - # sed -i "s/www-data/root/g" /lib/systemd/system/caddy.service - sed -i "/on-abnormal/a RestartSec=3" /lib/systemd/system/caddy.service - sed -i "s/on-abnormal/always/" /lib/systemd/system/caddy.service + # cp -f ${caddy_tmp}init/linux-systemd/caddy.service /lib/systemd/system/ + # # sed -i "s/www-data/root/g" /lib/systemd/system/caddy.service + # sed -i "/on-abnormal/a RestartSec=3" /lib/systemd/system/caddy.service + # sed -i "s/on-abnormal/always/" /lib/systemd/system/caddy.service + + #### 。。。。。 Warning.....Warning.......Warning........Warning...... + #### 。。。。。 use root user run caddy... + + cat >/lib/systemd/system/caddy.service <<-EOF + [Unit] + Description=Caddy HTTP/2 web server + Documentation=https://caddyserver.com/docs + After=network.target + Wants=network.target + + [Service] + Restart=always + RestartSec=3 + Environment=CADDYPATH=/root/.caddy + ExecStart=/usr/local/bin/caddy -log stdout -agree=true -conf=/etc/caddy/Caddyfile -root=/var/tmp + ExecReload=/bin/kill -USR1 $MAINPID + KillMode=mixed + KillSignal=SIGQUIT + TimeoutStopSec=5s + LimitNOFILE=1048576 + LimitNPROC=512 + + [Install] + WantedBy=multi-user.target + EOF systemctl enable caddy else cp -f ${caddy_tmp}init/linux-sysvinit/caddy /etc/init.d/caddy @@ -36,18 +64,18 @@ _install_caddy_service() { update-rc.d -f caddy defaults fi - if [ -z "$(grep www-data /etc/passwd)" ]; then - useradd -M -s /usr/sbin/nologin www-data - fi + # if [ -z "$(grep www-data /etc/passwd)" ]; then + # useradd -M -s /usr/sbin/nologin www-data + # fi # chown -R www-data.www-data /etc/ssl/caddy # ref https://github.com/caddyserver/caddy/tree/master/dist/init/linux-systemd mkdir -p /etc/caddy - chown -R root:root /etc/caddy - mkdir -p /etc/ssl/caddy - chown -R root:www-data /etc/ssl/caddy - chmod 0770 /etc/ssl/caddy + # chown -R root:root /etc/caddy + # mkdir -p /etc/ssl/caddy + # chown -R root:www-data /etc/ssl/caddy + # chmod 0770 /etc/ssl/caddy ## create sites dir mkdir -p /etc/caddy/sites diff --git a/v2ray.sh b/v2ray.sh index 61ceaba..75e68cd 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.14" +_version="v3.15" cmd="apt-get" From 37bd9a1d32e9665e158f493d2163809029495283 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Tue, 24 Sep 2019 14:34:02 +0800 Subject: [PATCH 03/21] fix bug --- src/download-caddy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/download-caddy.sh b/src/download-caddy.sh index 5191e8d..42498ad 100644 --- a/src/download-caddy.sh +++ b/src/download-caddy.sh @@ -19,7 +19,7 @@ _download_caddy_file() { wget -qO- https://getcaddy.com | bash -s personal if [[ ! -f /usr/local/bin/caddy ]]; then - echo -e "$red 安装 Caddy 出错!" && exit 1 + echo -e "$red 安装 Caddy 出错!$none" && exit 1 fi } _install_caddy_service() { From eab685736ce93acd7494ae7ff301fa2d96fcc244 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Fri, 11 Oct 2019 14:14:37 +0800 Subject: [PATCH 04/21] update caddy service --- src/download-caddy.sh | 86 +++++++++++++++++++++---------------------- v2ray.sh | 2 +- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/download-caddy.sh b/src/download-caddy.sh index 42498ad..692386f 100644 --- a/src/download-caddy.sh +++ b/src/download-caddy.sh @@ -1,32 +1,32 @@ _download_caddy_file() { - # caddy_tmp="/tmp/install_caddy/" - # caddy_tmp_file="/tmp/install_caddy/caddy.tar.gz" - # [[ -d $caddy_tmp ]] && rm -rf $caddy_tmp - # if [[ ! ${caddy_arch} ]]; then - # echo -e "$red 获取 Caddy 下载参数失败!$none" && exit 1 - # fi - # local caddy_download_link="https://caddyserver.com/download/linux/${caddy_arch}?license=personal" + caddy_tmp="/tmp/install_caddy/" + caddy_tmp_file="/tmp/install_caddy/caddy.tar.gz" + [[ -d $caddy_tmp ]] && rm -rf $caddy_tmp + if [[ ! ${caddy_arch} ]]; then + echo -e "$red 获取 Caddy 下载参数失败!$none" && exit 1 + fi + local caddy_download_link="https://caddyserver.com/download/linux/${caddy_arch}?license=personal" - # mkdir -p $caddy_tmp + mkdir -p $caddy_tmp - # if ! wget --no-check-certificate -O "$caddy_tmp_file" $caddy_download_link; then - # echo -e "$red 下载 Caddy 失败!$none" && exit 1 - # fi + if ! wget --no-check-certificate -O "$caddy_tmp_file" $caddy_download_link; then + echo -e "$red 下载 Caddy 失败!$none" && exit 1 + fi - # tar zxf $caddy_tmp_file -C $caddy_tmp - # cp -f ${caddy_tmp}caddy /usr/local/bin/ + tar zxf $caddy_tmp_file -C $caddy_tmp + cp -f ${caddy_tmp}caddy /usr/local/bin/ - wget -qO- https://getcaddy.com | bash -s personal + # wget -qO- https://getcaddy.com | bash -s personal if [[ ! -f /usr/local/bin/caddy ]]; then echo -e "$red 安装 Caddy 出错!$none" && exit 1 fi } _install_caddy_service() { - # setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/caddy + 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/ + cp -f ${caddy_tmp}init/linux-systemd/caddy.service /lib/systemd/system/ # # sed -i "s/www-data/root/g" /lib/systemd/system/caddy.service # sed -i "/on-abnormal/a RestartSec=3" /lib/systemd/system/caddy.service # sed -i "s/on-abnormal/always/" /lib/systemd/system/caddy.service @@ -34,28 +34,28 @@ _install_caddy_service() { #### 。。。。。 Warning.....Warning.......Warning........Warning...... #### 。。。。。 use root user run caddy... - cat >/lib/systemd/system/caddy.service <<-EOF - [Unit] - Description=Caddy HTTP/2 web server - Documentation=https://caddyserver.com/docs - After=network.target - Wants=network.target + # cat >/lib/systemd/system/caddy.service <<-EOF + # [Unit] + # Description=Caddy HTTP/2 web server + # Documentation=https://caddyserver.com/docs + # After=network.target + # Wants=network.target - [Service] - Restart=always - RestartSec=3 - Environment=CADDYPATH=/root/.caddy - ExecStart=/usr/local/bin/caddy -log stdout -agree=true -conf=/etc/caddy/Caddyfile -root=/var/tmp - ExecReload=/bin/kill -USR1 $MAINPID - KillMode=mixed - KillSignal=SIGQUIT - TimeoutStopSec=5s - LimitNOFILE=1048576 - LimitNPROC=512 + # [Service] + # Restart=always + # RestartSec=3 + # Environment=CADDYPATH=/root/.caddy + # ExecStart=/usr/local/bin/caddy -log stdout -agree=true -conf=/etc/caddy/Caddyfile -root=/var/tmp + # ExecReload=/bin/kill -USR1 $MAINPID + # KillMode=mixed + # KillSignal=SIGQUIT + # TimeoutStopSec=5s + # LimitNOFILE=1048576 + # LimitNPROC=512 - [Install] - WantedBy=multi-user.target - EOF + # [Install] + # WantedBy=multi-user.target + # EOF systemctl enable caddy else cp -f ${caddy_tmp}init/linux-sysvinit/caddy /etc/init.d/caddy @@ -64,18 +64,18 @@ _install_caddy_service() { update-rc.d -f caddy defaults fi - # if [ -z "$(grep www-data /etc/passwd)" ]; then - # useradd -M -s /usr/sbin/nologin www-data - # fi + if [ -z "$(grep www-data /etc/passwd)" ]; then + useradd -M -s /usr/sbin/nologin www-data + fi # chown -R www-data.www-data /etc/ssl/caddy # ref https://github.com/caddyserver/caddy/tree/master/dist/init/linux-systemd mkdir -p /etc/caddy - # chown -R root:root /etc/caddy - # mkdir -p /etc/ssl/caddy - # chown -R root:www-data /etc/ssl/caddy - # chmod 0770 /etc/ssl/caddy + chown -R root:root /etc/caddy + mkdir -p /etc/ssl/caddy + chown -R root:www-data /etc/ssl/caddy + chmod 0770 /etc/ssl/caddy ## create sites dir mkdir -p /etc/caddy/sites diff --git a/v2ray.sh b/v2ray.sh index 75e68cd..18b8d3e 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.15" +_version="v3.16" cmd="apt-get" From 97d78c82848dd210d44a8fb6a61916e88c7e67f5 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Sat, 12 Oct 2019 17:31:39 +0800 Subject: [PATCH 05/21] use new caddy.service --- src/download-caddy.sh | 9 ++++++--- v2ray.sh | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/download-caddy.sh b/src/download-caddy.sh index 692386f..36f9b5e 100644 --- a/src/download-caddy.sh +++ b/src/download-caddy.sh @@ -26,7 +26,10 @@ _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/ + # 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/www-data/root/g" /lib/systemd/system/caddy.service # sed -i "/on-abnormal/a RestartSec=3" /lib/systemd/system/caddy.service # sed -i "s/on-abnormal/always/" /lib/systemd/system/caddy.service @@ -40,7 +43,7 @@ _install_caddy_service() { # Documentation=https://caddyserver.com/docs # After=network.target # Wants=network.target - + # [Service] # Restart=always # RestartSec=3 @@ -52,7 +55,7 @@ _install_caddy_service() { # TimeoutStopSec=5s # LimitNOFILE=1048576 # LimitNPROC=512 - + # [Install] # WantedBy=multi-user.target # EOF diff --git a/v2ray.sh b/v2ray.sh index 18b8d3e..a9ddfbe 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.16" +_version="v3.17" cmd="apt-get" From 344a7becbe2cc854476377b9ee51080cb4c10e92 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Sat, 26 Oct 2019 22:25:39 +0800 Subject: [PATCH 06/21] only check ipv4 addr, fix #367, fix #370 --- install.sh | 2 +- v2ray.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index 05e1c2c..5c91b33 100644 --- a/install.sh +++ b/install.sh @@ -745,7 +745,7 @@ 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}") if [[ $test_domain != $ip ]]; then echo echo -e "$red 检测域名解析错误....$none" diff --git a/v2ray.sh b/v2ray.sh index a9ddfbe..daa01fd 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.17" +_version="v3.18" cmd="apt-get" @@ -1763,7 +1763,7 @@ 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}") if [[ $test_domain != $ip ]]; then echo echo -e "$red 检测域名解析错误....$none" From 3c3eb91d7d2fac94b5e3387e290a4b579d8a4e83 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Sun, 27 Oct 2019 19:16:34 +0800 Subject: [PATCH 07/21] fix ping not support '-4' option. #367, #370 --- install.sh | 4 +++- v2ray.sh | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index 5c91b33..e1974aa 100644 --- a/install.sh +++ b/install.sh @@ -745,7 +745,9 @@ domain_check() { # $cmd install dnsutils -y # fi # test_domain=$(dig $domain +short) - test_domain=$(ping $domain -c 1 -4 | 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" diff --git a/v2ray.sh b/v2ray.sh index daa01fd..f45b60c 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.18" +_version="v3.19" 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 -4 | 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" 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 08/21] 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" From e01ba622665aa546fcf52a9807f0e934fbb5ac2c Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Fri, 1 Nov 2019 10:14:58 +0800 Subject: [PATCH 09/21] fix quic issues #371 --- config/server/dynamic/quic.json | 2 -- config/server/quic.json | 1 - v2ray.sh | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/config/server/dynamic/quic.json b/config/server/dynamic/quic.json index 16911b4..dad9718 100644 --- a/config/server/dynamic/quic.json +++ b/config/server/dynamic/quic.json @@ -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" diff --git a/config/server/quic.json b/config/server/quic.json index 2379fd1..4da010a 100644 --- a/config/server/quic.json +++ b/config/server/quic.json @@ -20,7 +20,6 @@ "streamSettings": { "network": "quic", "quicSettings": { - "security": "aes-128-gcm", "key": "", "header": { "type": "none" diff --git a/v2ray.sh b/v2ray.sh index 15bf8a0..4532b63 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.20" +_version="v3.21" cmd="apt-get" From 29c99e16b1ed4c40087814a0388b42edd1c698b0 Mon Sep 17 00:00:00 2001 From: zqigolden Date: Fri, 1 Nov 2019 17:42:30 +0800 Subject: [PATCH 10/21] Update v2ray.sh --- v2ray.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2ray.sh b/v2ray.sh index 4532b63..6bbc0ae 100644 --- a/v2ray.sh +++ b/v2ray.sh @@ -1765,7 +1765,7 @@ domain_check() { # test_domain=$(dig $new_domain +short) # 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) + 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" From 5ea36e805ed5d6e9038454fa2927b0056940dd9e Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Fri, 1 Nov 2019 19:02:04 +0800 Subject: [PATCH 11/21] fix domain check bug. --- v2ray.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/v2ray.sh b/v2ray.sh index 6bbc0ae..240b7e7 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.21" +_version="v3.22" cmd="apt-get" @@ -1763,8 +1763,8 @@ change_proxy_site_config() { } domain_check() { # test_domain=$(dig $new_domain +short) - # 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=$(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 From af60aac5dd7e45a84685465316c6d5f58989a57e Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Thu, 7 Nov 2019 10:38:15 +0800 Subject: [PATCH 12/21] enable sniffing --- config/client/h2.json | 4 ++++ config/client/http.json | 4 ++++ config/client/kcp.json | 4 ++++ config/client/quic.json | 4 ++++ config/client/tcp.json | 4 ++++ config/client/ws.json | 4 ++++ config/client/ws_tls.json | 4 ++++ v2ray.sh | 2 +- 8 files changed, 29 insertions(+), 1 deletion(-) diff --git a/config/client/h2.json b/config/client/h2.json index c11edcf..277d286 100644 --- a/config/client/h2.json +++ b/config/client/h2.json @@ -54,6 +54,10 @@ "network": "tcp,udp", "timeout": 0, "followRedirect": true + }, + "sniffing": { + "enabled": true, + "destOverride": ["http", "tls"] } }, { diff --git a/config/client/http.json b/config/client/http.json index 4dd7fcc..f33004a 100644 --- a/config/client/http.json +++ b/config/client/http.json @@ -84,6 +84,10 @@ "network": "tcp,udp", "timeout": 0, "followRedirect": true + }, + "sniffing": { + "enabled": true, + "destOverride": ["http", "tls"] } }, { diff --git a/config/client/kcp.json b/config/client/kcp.json index 4a6f583..04247d0 100644 --- a/config/client/kcp.json +++ b/config/client/kcp.json @@ -55,6 +55,10 @@ "network": "tcp,udp", "timeout": 0, "followRedirect": true + }, + "sniffing": { + "enabled": true, + "destOverride": ["http", "tls"] } }, { diff --git a/config/client/quic.json b/config/client/quic.json index 26eef04..9877e79 100644 --- a/config/client/quic.json +++ b/config/client/quic.json @@ -54,6 +54,10 @@ "network": "tcp,udp", "timeout": 0, "followRedirect": true + }, + "sniffing": { + "enabled": true, + "destOverride": ["http", "tls"] } }, { diff --git a/config/client/tcp.json b/config/client/tcp.json index e2493a9..6e7756a 100644 --- a/config/client/tcp.json +++ b/config/client/tcp.json @@ -44,6 +44,10 @@ "network": "tcp,udp", "timeout": 0, "followRedirect": true + }, + "sniffing": { + "enabled": true, + "destOverride": ["http", "tls"] } }, { diff --git a/config/client/ws.json b/config/client/ws.json index 55d842b..38d2e3c 100644 --- a/config/client/ws.json +++ b/config/client/ws.json @@ -47,6 +47,10 @@ "network": "tcp,udp", "timeout": 0, "followRedirect": true + }, + "sniffing": { + "enabled": true, + "destOverride": ["http", "tls"] } }, { diff --git a/config/client/ws_tls.json b/config/client/ws_tls.json index 1782dfb..f53ab58 100644 --- a/config/client/ws_tls.json +++ b/config/client/ws_tls.json @@ -57,6 +57,10 @@ "network": "tcp,udp", "timeout": 0, "followRedirect": true + }, + "sniffing": { + "enabled": true, + "destOverride": ["http", "tls"] } }, { diff --git a/v2ray.sh b/v2ray.sh index 240b7e7..7a1d26c 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.22" +_version="v3.23" cmd="apt-get" From 3a2b81cdf74877339827d26a886e325a2c36c0ff Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Fri, 8 Nov 2019 14:28:04 +0800 Subject: [PATCH 13/21] fix caddy cannot running. fix #392, fix #392 --- src/download-caddy.sh | 1 + v2ray.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/download-caddy.sh b/src/download-caddy.sh index 36f9b5e..8985b0a 100644 --- a/src/download-caddy.sh +++ b/src/download-caddy.sh @@ -30,6 +30,7 @@ _install_caddy_service() { 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 # # sed -i "s/www-data/root/g" /lib/systemd/system/caddy.service # sed -i "/on-abnormal/a RestartSec=3" /lib/systemd/system/caddy.service # sed -i "s/on-abnormal/always/" /lib/systemd/system/caddy.service diff --git a/v2ray.sh b/v2ray.sh index 7a1d26c..5c49848 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.23" +_version="v3.24" cmd="apt-get" From d568ae0299648ff7f142664c679a55505ec209c1 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Mon, 11 Nov 2019 15:43:31 +0800 Subject: [PATCH 14/21] update caddy.service --- src/download-caddy.sh | 9 ++++++--- v2ray.sh | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/download-caddy.sh b/src/download-caddy.sh index 8985b0a..b5fd2ec 100644 --- a/src/download-caddy.sh +++ b/src/download-caddy.sh @@ -27,10 +27,13 @@ _install_caddy_service() { 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 + # 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/-log-timestamps=false//g" /lib/systemd/system/caddy.service # # sed -i "s/www-data/root/g" /lib/systemd/system/caddy.service # sed -i "/on-abnormal/a RestartSec=3" /lib/systemd/system/caddy.service # sed -i "s/on-abnormal/always/" /lib/systemd/system/caddy.service diff --git a/v2ray.sh b/v2ray.sh index 5c49848..0116f15 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.24" +_version="v3.25" cmd="apt-get" From 5c0193f847575881a20c928079dcd84e1afba978 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Tue, 12 Nov 2019 15:30:54 +0800 Subject: [PATCH 15/21] fix caddy.service not found. fix #397 #398 --- src/download-caddy.sh | 2 +- v2ray.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/download-caddy.sh b/src/download-caddy.sh index b5fd2ec..56a661f 100644 --- a/src/download-caddy.sh +++ b/src/download-caddy.sh @@ -26,7 +26,7 @@ _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/ + 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 diff --git a/v2ray.sh b/v2ray.sh index 0116f15..1420c13 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.25" +_version="v3.26" cmd="apt-get" From 5dd0aac87bd4afc4959a2a49be406c299847f26c Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Sun, 29 Dec 2019 19:06:36 +0800 Subject: [PATCH 16/21] support DOH --- config/server/dynamic/http.json | 1 + config/server/dynamic/kcp.json | 1 + config/server/dynamic/quic.json | 1 + config/server/dynamic/tcp.json | 1 + config/server/dynamic/ws.json | 1 + config/server/h2.json | 1 + config/server/http.json | 1 + config/server/kcp.json | 1 + config/server/quic.json | 1 + config/server/tcp.json | 1 + config/server/ws.json | 1 + v2ray.sh | 2 +- 12 files changed, 12 insertions(+), 1 deletion(-) diff --git a/config/server/dynamic/http.json b/config/server/dynamic/http.json index 4661469..f9ec10c 100644 --- a/config/server/dynamic/http.json +++ b/config/server/dynamic/http.json @@ -119,6 +119,7 @@ ], "dns": { "server": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", diff --git a/config/server/dynamic/kcp.json b/config/server/dynamic/kcp.json index 48e3b8b..ec0be0c 100644 --- a/config/server/dynamic/kcp.json +++ b/config/server/dynamic/kcp.json @@ -91,6 +91,7 @@ ], "dns": { "server": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", diff --git a/config/server/dynamic/quic.json b/config/server/dynamic/quic.json index dad9718..aa242b7 100644 --- a/config/server/dynamic/quic.json +++ b/config/server/dynamic/quic.json @@ -93,6 +93,7 @@ ], "dns": { "server": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", diff --git a/config/server/dynamic/tcp.json b/config/server/dynamic/tcp.json index 7c4d90b..66981a9 100644 --- a/config/server/dynamic/tcp.json +++ b/config/server/dynamic/tcp.json @@ -78,6 +78,7 @@ ], "dns": { "server": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", diff --git a/config/server/dynamic/ws.json b/config/server/dynamic/ws.json index 51c889a..a3f3700 100644 --- a/config/server/dynamic/ws.json +++ b/config/server/dynamic/ws.json @@ -81,6 +81,7 @@ ], "dns": { "server": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", diff --git a/config/server/h2.json b/config/server/h2.json index 6be2a38..9387ae4 100644 --- a/config/server/h2.json +++ b/config/server/h2.json @@ -74,6 +74,7 @@ ], "dns": { "server": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", diff --git a/config/server/http.json b/config/server/http.json index 77e1a8b..595afa9 100644 --- a/config/server/http.json +++ b/config/server/http.json @@ -92,6 +92,7 @@ ], "dns": { "server": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", diff --git a/config/server/kcp.json b/config/server/kcp.json index bca8dad..891be95 100644 --- a/config/server/kcp.json +++ b/config/server/kcp.json @@ -64,6 +64,7 @@ ], "dns": { "server": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", diff --git a/config/server/quic.json b/config/server/quic.json index 4da010a..8006250 100644 --- a/config/server/quic.json +++ b/config/server/quic.json @@ -65,6 +65,7 @@ ], "dns": { "server": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", diff --git a/config/server/tcp.json b/config/server/tcp.json index 01819bf..c7548e0 100644 --- a/config/server/tcp.json +++ b/config/server/tcp.json @@ -59,6 +59,7 @@ ], "dns": { "server": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", diff --git a/config/server/ws.json b/config/server/ws.json index 4a45f22..41c42cb 100644 --- a/config/server/ws.json +++ b/config/server/ws.json @@ -59,6 +59,7 @@ ], "dns": { "server": [ + "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", "8.8.8.8", diff --git a/v2ray.sh b/v2ray.sh index 1420c13..29732d1 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.26" +_version="v3.27" cmd="apt-get" From 35cc43c045e9d19dcf9ca170492876409639b52a Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Mon, 30 Dec 2019 19:10:48 +0800 Subject: [PATCH 17/21] fix error --- config/server/dynamic/http.json | 14 ++++++-------- config/server/dynamic/kcp.json | 14 ++++++-------- config/server/dynamic/quic.json | 14 ++++++-------- config/server/dynamic/tcp.json | 14 ++++++-------- config/server/dynamic/ws.json | 14 ++++++-------- config/server/h2.json | 14 ++++++-------- config/server/http.json | 14 ++++++-------- config/server/kcp.json | 12 +++++------- config/server/quic.json | 12 +++++------- config/server/tcp.json | 14 ++++++-------- config/server/ws.json | 14 ++++++-------- v2ray.sh | 2 +- 12 files changed, 65 insertions(+), 87 deletions(-) diff --git a/config/server/dynamic/http.json b/config/server/dynamic/http.json index f9ec10c..56cd516 100644 --- a/config/server/dynamic/http.json +++ b/config/server/dynamic/http.json @@ -97,18 +97,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, + }, { "protocol": "mtproto", "settings": {}, @@ -118,7 +116,7 @@ // ], "dns": { - "server": [ + "servers": [ "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", diff --git a/config/server/dynamic/kcp.json b/config/server/dynamic/kcp.json index ec0be0c..7f869a9 100644 --- a/config/server/dynamic/kcp.json +++ b/config/server/dynamic/kcp.json @@ -69,18 +69,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, + }, { "protocol": "mtproto", "settings": {}, @@ -90,7 +88,7 @@ // ], "dns": { - "server": [ + "servers": [ "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", diff --git a/config/server/dynamic/quic.json b/config/server/dynamic/quic.json index aa242b7..788b94a 100644 --- a/config/server/dynamic/quic.json +++ b/config/server/dynamic/quic.json @@ -71,18 +71,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, + }, { "protocol": "mtproto", "settings": {}, @@ -92,7 +90,7 @@ // ], "dns": { - "server": [ + "servers": [ "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", diff --git a/config/server/dynamic/tcp.json b/config/server/dynamic/tcp.json index 66981a9..a504966 100644 --- a/config/server/dynamic/tcp.json +++ b/config/server/dynamic/tcp.json @@ -56,18 +56,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, + }, { "protocol": "mtproto", "settings": {}, @@ -77,7 +75,7 @@ // ], "dns": { - "server": [ + "servers": [ "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", diff --git a/config/server/dynamic/ws.json b/config/server/dynamic/ws.json index a3f3700..fa5c01e 100644 --- a/config/server/dynamic/ws.json +++ b/config/server/dynamic/ws.json @@ -59,18 +59,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, + }, { "protocol": "mtproto", "settings": {}, @@ -80,7 +78,7 @@ // ], "dns": { - "server": [ + "servers": [ "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", diff --git a/config/server/h2.json b/config/server/h2.json index 9387ae4..0f6dc38 100644 --- a/config/server/h2.json +++ b/config/server/h2.json @@ -52,18 +52,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, + }, { "protocol": "mtproto", "settings": {}, @@ -73,7 +71,7 @@ // ], "dns": { - "server": [ + "servers": [ "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", diff --git a/config/server/http.json b/config/server/http.json index 595afa9..fb04dec 100644 --- a/config/server/http.json +++ b/config/server/http.json @@ -70,18 +70,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, + }, { "protocol": "mtproto", "settings": {}, @@ -91,7 +89,7 @@ // ], "dns": { - "server": [ + "servers": [ "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", diff --git a/config/server/kcp.json b/config/server/kcp.json index 891be95..150c32f 100644 --- a/config/server/kcp.json +++ b/config/server/kcp.json @@ -42,18 +42,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, { "protocol": "mtproto", "settings": {}, @@ -63,7 +61,7 @@ // ], "dns": { - "server": [ + "servers": [ "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", diff --git a/config/server/quic.json b/config/server/quic.json index 8006250..a94929a 100644 --- a/config/server/quic.json +++ b/config/server/quic.json @@ -43,18 +43,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, { "protocol": "mtproto", "settings": {}, @@ -64,7 +62,7 @@ // ], "dns": { - "server": [ + "servers": [ "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", diff --git a/config/server/tcp.json b/config/server/tcp.json index c7548e0..bb9728a 100644 --- a/config/server/tcp.json +++ b/config/server/tcp.json @@ -37,18 +37,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, + }, { "protocol": "mtproto", "settings": {}, @@ -58,7 +56,7 @@ // ], "dns": { - "server": [ + "servers": [ "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", diff --git a/config/server/ws.json b/config/server/ws.json index 41c42cb..50bb4c6 100644 --- a/config/server/ws.json +++ b/config/server/ws.json @@ -37,18 +37,16 @@ "outbounds": [ { "protocol": "freedom", - "settings": {} + "settings": { + "domainStrategy": "UseIP" + }, + "tag": "direct" }, { "protocol": "blackhole", "settings": {}, "tag": "blocked" - }, - { - "protocol": "freedom", - "settings": {}, - "tag": "direct" - }, + }, { "protocol": "mtproto", "settings": {}, @@ -58,7 +56,7 @@ // ], "dns": { - "server": [ + "servers": [ "https+local://1.1.1.1/dns-query", "1.1.1.1", "1.0.0.1", diff --git a/v2ray.sh b/v2ray.sh index 29732d1..5b4a40d 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.27" +_version="v3.28" cmd="apt-get" From 1b7042f6f2e067374a6c7f68e94508607fca3f4d Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Tue, 31 Dec 2019 11:53:45 +0800 Subject: [PATCH 18/21] update clients dns --- config/client/h2.json | 15 +++++++++++---- config/client/http.json | 15 +++++++++++---- config/client/kcp.json | 15 +++++++++++---- config/client/quic.json | 15 +++++++++++---- config/client/tcp.json | 15 +++++++++++---- config/client/ws.json | 15 +++++++++++---- config/client/ws_tls.json | 15 +++++++++++---- src/download-v2ray.sh | 25 ++++++------------------- v2ray.sh | 2 +- 9 files changed, 84 insertions(+), 48 deletions(-) diff --git a/config/client/h2.json b/config/client/h2.json index 277d286..d7a0d39 100644 --- a/config/client/h2.json +++ b/config/client/h2.json @@ -90,17 +90,24 @@ ], "dns": { "servers": [ - "1.1.1.1", - "1.0.0.1", { "address": "119.29.29.29", "port": 53, "domains": [ - "geosite:cn" + "geosite:cn" + ], + "expectIPs": [ + "geoip:cn" + ] + }, + { + "address": "1.1.1.1", + "port": 53, + "domains": [ + "geosite:geolocation-!cn" ] }, "8.8.8.8", - "8.8.4.4", "localhost" ] }, diff --git a/config/client/http.json b/config/client/http.json index f33004a..ac87af1 100644 --- a/config/client/http.json +++ b/config/client/http.json @@ -120,17 +120,24 @@ ], "dns": { "servers": [ - "1.1.1.1", - "1.0.0.1", { "address": "119.29.29.29", "port": 53, "domains": [ - "geosite:cn" + "geosite:cn" + ], + "expectIPs": [ + "geoip:cn" + ] + }, + { + "address": "1.1.1.1", + "port": 53, + "domains": [ + "geosite:geolocation-!cn" ] }, "8.8.8.8", - "8.8.4.4", "localhost" ] }, diff --git a/config/client/kcp.json b/config/client/kcp.json index 04247d0..dafda17 100644 --- a/config/client/kcp.json +++ b/config/client/kcp.json @@ -91,17 +91,24 @@ ], "dns": { "servers": [ - "1.1.1.1", - "1.0.0.1", { "address": "119.29.29.29", "port": 53, "domains": [ - "geosite:cn" + "geosite:cn" + ], + "expectIPs": [ + "geoip:cn" + ] + }, + { + "address": "1.1.1.1", + "port": 53, + "domains": [ + "geosite:geolocation-!cn" ] }, "8.8.8.8", - "8.8.4.4", "localhost" ] }, diff --git a/config/client/quic.json b/config/client/quic.json index 9877e79..01b2c06 100644 --- a/config/client/quic.json +++ b/config/client/quic.json @@ -90,17 +90,24 @@ ], "dns": { "servers": [ - "1.1.1.1", - "1.0.0.1", { "address": "119.29.29.29", "port": 53, "domains": [ - "geosite:cn" + "geosite:cn" + ], + "expectIPs": [ + "geoip:cn" + ] + }, + { + "address": "1.1.1.1", + "port": 53, + "domains": [ + "geosite:geolocation-!cn" ] }, "8.8.8.8", - "8.8.4.4", "localhost" ] }, diff --git a/config/client/tcp.json b/config/client/tcp.json index 6e7756a..687d80e 100644 --- a/config/client/tcp.json +++ b/config/client/tcp.json @@ -80,17 +80,24 @@ ], "dns": { "servers": [ - "1.1.1.1", - "1.0.0.1", { "address": "119.29.29.29", "port": 53, "domains": [ - "geosite:cn" + "geosite:cn" + ], + "expectIPs": [ + "geoip:cn" + ] + }, + { + "address": "1.1.1.1", + "port": 53, + "domains": [ + "geosite:geolocation-!cn" ] }, "8.8.8.8", - "8.8.4.4", "localhost" ] }, diff --git a/config/client/ws.json b/config/client/ws.json index 38d2e3c..108bc49 100644 --- a/config/client/ws.json +++ b/config/client/ws.json @@ -83,17 +83,24 @@ ], "dns": { "servers": [ - "1.1.1.1", - "1.0.0.1", { "address": "119.29.29.29", "port": 53, "domains": [ - "geosite:cn" + "geosite:cn" + ], + "expectIPs": [ + "geoip:cn" + ] + }, + { + "address": "1.1.1.1", + "port": 53, + "domains": [ + "geosite:geolocation-!cn" ] }, "8.8.8.8", - "8.8.4.4", "localhost" ] }, diff --git a/config/client/ws_tls.json b/config/client/ws_tls.json index f53ab58..85c1625 100644 --- a/config/client/ws_tls.json +++ b/config/client/ws_tls.json @@ -93,17 +93,24 @@ ], "dns": { "servers": [ - "1.1.1.1", - "1.0.0.1", { "address": "119.29.29.29", "port": 53, "domains": [ - "geosite:cn" + "geosite:cn" + ], + "expectIPs": [ + "geoip:cn" + ] + }, + { + "address": "1.1.1.1", + "port": 53, + "domains": [ + "geosite:geolocation-!cn" ] }, "8.8.8.8", - "8.8.4.4", "localhost" ] }, diff --git a/src/download-v2ray.sh b/src/download-v2ray.sh index 4cc285e..5a5ed5a 100644 --- a/src/download-v2ray.sh +++ b/src/download-v2ray.sh @@ -15,9 +15,7 @@ _get_latest_version() { _download_v2ray_file() { _get_latest_version - [[ -d /tmp/v2ray ]] && rm -rf /tmp/v2ray - mkdir -p /tmp/v2ray - v2ray_tmp_file="/tmp/v2ray/v2ray.zip" + v2ray_tmp_file="/tmp/v2ray.zip" v2ray_download_link="https://github.com/v2ray/v2ray-core/releases/download/$v2ray_latest_ver/v2ray-linux-${v2ray_bit}.zip" if ! wget --no-check-certificate -O "$v2ray_tmp_file" $v2ray_download_link; then @@ -26,26 +24,15 @@ _download_v2ray_file() { " && exit 1 fi - unzip $v2ray_tmp_file -d "/tmp/v2ray/" - mkdir -p /usr/bin/v2ray - cp -f "/tmp/v2ray/v2ray" "/usr/bin/v2ray/v2ray" - chmod +x "/usr/bin/v2ray/v2ray" + unzip -o $v2ray_tmp_file -d "/usr/bin/v2ray/" + chmod +x /usr/bin/v2ray/{v2ray,v2ctl} echo "alias v2ray=$_v2ray_sh" >>/root/.bashrc - cp -f "/tmp/v2ray/v2ctl" "/usr/bin/v2ray/v2ctl" - chmod +x "/usr/bin/v2ray/v2ctl" } _install_v2ray_service() { - if [[ $systemd ]]; then - cp -f "/tmp/v2ray/systemd/v2ray.service" "/lib/systemd/system/" - sed -i "s/on-failure/always/" /lib/systemd/system/v2ray.service - systemctl enable v2ray - else - apt-get install -y daemon - cp "/tmp/v2ray/systemv/v2ray" "/etc/init.d/v2ray" - chmod +x "/etc/init.d/v2ray" - update-rc.d -f v2ray defaults - fi + cp -f "/usr/bin/v2ray/systemd/v2ray.service" "/lib/systemd/system/" + sed -i "s/on-failure/always/" /lib/systemd/system/v2ray.service + systemctl enable v2ray } _update_v2ray_version() { diff --git a/v2ray.sh b/v2ray.sh index 5b4a40d..aff40f1 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.28" +_version="v3.29" cmd="apt-get" From 0587560602d66ec3516d7e09c7c1364a0f9ec483 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Sat, 4 Jan 2020 12:21:28 +0800 Subject: [PATCH 19/21] update config --- config/server/dynamic/http.json | 5 +---- config/server/dynamic/kcp.json | 5 +---- config/server/dynamic/quic.json | 5 +---- config/server/dynamic/tcp.json | 5 +---- config/server/dynamic/ws.json | 5 +---- config/server/h2.json | 5 +---- config/server/http.json | 5 +---- config/server/kcp.json | 5 +---- config/server/quic.json | 5 +---- config/server/tcp.json | 5 +---- config/server/ws.json | 5 +---- 11 files changed, 11 insertions(+), 44 deletions(-) diff --git a/config/server/dynamic/http.json b/config/server/dynamic/http.json index 56cd516..bf5f85d 100644 --- a/config/server/dynamic/http.json +++ b/config/server/dynamic/http.json @@ -166,9 +166,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/dynamic/kcp.json b/config/server/dynamic/kcp.json index 7f869a9..5e8fb16 100644 --- a/config/server/dynamic/kcp.json +++ b/config/server/dynamic/kcp.json @@ -138,9 +138,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/dynamic/quic.json b/config/server/dynamic/quic.json index 788b94a..73dda58 100644 --- a/config/server/dynamic/quic.json +++ b/config/server/dynamic/quic.json @@ -140,9 +140,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/dynamic/tcp.json b/config/server/dynamic/tcp.json index a504966..9a8e049 100644 --- a/config/server/dynamic/tcp.json +++ b/config/server/dynamic/tcp.json @@ -125,9 +125,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/dynamic/ws.json b/config/server/dynamic/ws.json index fa5c01e..31ecee3 100644 --- a/config/server/dynamic/ws.json +++ b/config/server/dynamic/ws.json @@ -128,9 +128,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/h2.json b/config/server/h2.json index 0f6dc38..fc52a20 100644 --- a/config/server/h2.json +++ b/config/server/h2.json @@ -121,9 +121,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/http.json b/config/server/http.json index fb04dec..666d313 100644 --- a/config/server/http.json +++ b/config/server/http.json @@ -139,9 +139,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/kcp.json b/config/server/kcp.json index 150c32f..e282d95 100644 --- a/config/server/kcp.json +++ b/config/server/kcp.json @@ -111,9 +111,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/quic.json b/config/server/quic.json index a94929a..61cb30b 100644 --- a/config/server/quic.json +++ b/config/server/quic.json @@ -112,9 +112,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/tcp.json b/config/server/tcp.json index bb9728a..bfff340 100644 --- a/config/server/tcp.json +++ b/config/server/tcp.json @@ -106,9 +106,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file diff --git a/config/server/ws.json b/config/server/ws.json index 50bb4c6..2fc7813 100644 --- a/config/server/ws.json +++ b/config/server/ws.json @@ -106,9 +106,6 @@ "uplinkCapacity": 100, "downlinkCapacity": 100, "congestion": true - }, - "sockopt": { - "tcpFastOpen": true - } + } } } \ No newline at end of file From dc36df795969ed2372cac53ccd9aa4a53c4ad6b1 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Wed, 15 Jan 2020 21:40:16 +0800 Subject: [PATCH 20/21] update ver --- src/ss-info.sh | 2 ++ src/v2ray-info.sh | 2 ++ v2ray.sh | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ss-info.sh b/src/ss-info.sh index 7d37007..571091c 100644 --- a/src/ss-info.sh +++ b/src/ss-info.sh @@ -18,4 +18,6 @@ if [[ $shadowsocks ]]; then echo echo -e "提示: 输入$cyan v2ray ssqr $none可生成 Shadowsocks 二维码链接" echo + echo -e "${yellow}免被墙..推荐使用JMS: ${cyan}https://getjms.com${none}" + echo fi diff --git a/src/v2ray-info.sh b/src/v2ray-info.sh index 43c65f6..18f6c2a 100644 --- a/src/v2ray-info.sh +++ b/src/v2ray-info.sh @@ -133,4 +133,6 @@ _v2_info() { echo echo -e "提示: 输入$cyan v2ray url $none可生成 vmess URL 链接 / 输入$cyan v2ray qr $none可生成二维码链接" echo + echo -e "${yellow}免被墙..推荐使用JMS: ${cyan}https://getjms.com${none}" + echo } diff --git a/v2ray.sh b/v2ray.sh index aff40f1..1d3dcb2 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.29" +_version="v3.30" cmd="apt-get" @@ -2279,6 +2279,8 @@ get_v2ray_vmess_URL_link() { echo echo -e ${cyan}$vmess${none} echo + echo -e "${yellow}免被墙..推荐使用JMS: ${cyan}https://getjms.com${none}" + echo rm -rf /etc/v2ray/vmess_qr.json } other() { From 05b345cce1e2b014b571745bdad0bf94d37298a8 Mon Sep 17 00:00:00 2001 From: 233boy <31657650+233boy@users.noreply.github.com> Date: Thu, 16 Jan 2020 17:54:30 +0800 Subject: [PATCH 21/21] tg channel --- v2ray.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/v2ray.sh b/v2ray.sh index 1d3dcb2..b5e6a45 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.30" +_version="v3.31" cmd="apt-get" @@ -2679,7 +2679,7 @@ menu() { echo echo "反馈问题: https://github.com/233boy/v2ray/issues" echo - echo "TG 群组: https://t.me/blog233" + echo "TG 频道: https://t.me/tg2333" echo echo "捐赠脚本作者: https://233v2.com/donate/" echo