From f66d98dfefc88c980588dc8349610a28914d9b00 Mon Sep 17 00:00:00 2001 From: mack-a <57424792+mack-a@users.noreply.github.com> Date: Wed, 26 Aug 2020 15:37:13 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B4=E7=90=86):=20=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E6=95=B4=E7=90=86=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 37 +++++------------- .../Cloudflare_Flexible.md | 0 .../Cloudflare_Full.md | 0 Trojan.md => documents/Trojan.md | 0 bbr.md => documents/bbr.md | 0 .../cloudflare_workers.md | 0 firewall.md => documents/firewall.md | 0 free_account.md => documents/free_account.md | 0 .../optimize_V2Ray.md | 0 .../recover_version.md | 0 settings.md => documents/settings.md | 0 .../traffic_relay_tcp_vmess.md | 0 .../traffic_relay_tls_ws.md | 0 {blog => fodder/blog}/unable/html.zip | Bin .../find_best_cdn_ip.sh | 0 init_gcp_ssh.sh => shell/init_gcp_ssh.sh | 0 init_tls.sh => shell/init_tls.sh | 0 install_trojan.sh => shell/install_trojan.sh | 0 ping_tool.sh => shell/ping_tool.sh | 0 test.sh | 26 ------------ 20 files changed, 10 insertions(+), 53 deletions(-) rename Cloudflare_Flexible.md => documents/Cloudflare_Flexible.md (100%) rename Cloudflare_Full.md => documents/Cloudflare_Full.md (100%) rename Trojan.md => documents/Trojan.md (100%) rename bbr.md => documents/bbr.md (100%) rename cloudflare_workers.md => documents/cloudflare_workers.md (100%) rename firewall.md => documents/firewall.md (100%) rename free_account.md => documents/free_account.md (100%) rename optimize_V2Ray.md => documents/optimize_V2Ray.md (100%) rename recover_version.md => documents/recover_version.md (100%) rename settings.md => documents/settings.md (100%) rename traffic_relay_tcp_vmess.md => documents/traffic_relay_tcp_vmess.md (100%) rename traffic_relay_tls_ws.md => documents/traffic_relay_tls_ws.md (100%) rename {blog => fodder/blog}/unable/html.zip (100%) rename find_best_cdn_ip.sh => shell/find_best_cdn_ip.sh (100%) rename init_gcp_ssh.sh => shell/init_gcp_ssh.sh (100%) rename init_tls.sh => shell/init_tls.sh (100%) rename install_trojan.sh => shell/install_trojan.sh (100%) rename ping_tool.sh => shell/ping_tool.sh (100%) delete mode 100755 test.sh diff --git a/README.md b/README.md index 57ab06d..7702f71 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,14 @@ - 推荐 [一键CDN+TLS+WebSocket+Nginx+V2Ray（Vmess/VLESS）+伪装博客脚本【小白推荐】](#全自动websockettlscdn智能优选cloudflare-ip一键脚本) - 此项目采用[CDN+TLS+Nginx+V2Ray（Vmess/VLESS）](#全自动websockettlscdn智能优选cloudflare-ip一键脚本)、[Trojan](#2Trojan)、[Cloudflare Workers](#方法3workers) 进行模拟正常网站并突破防火墙，同时包含优化方法，以及简单的原理讲解。 -- [优化方案【CDN自选IP、断流优化】](https://github.com/mack-a/v2ray-agent/blob/master/optimize_V2Ray.md) +- [优化方案【CDN自选IP、断流优化】](https://github.com/mack-a/v2ray-agent/blob/master/documents/optimize_V2Ray.md) - [流量中转教程 wikihost](#流量转发服务) - [自建教程](#自建教程)可以快速入手并知晓其中的步骤。如遇到不懂以及不理解的可以加入[TG群讨论](https://t.me/technologyshare)。 -- [免费订阅链接【878.12 GB of 2 TB Used 2020-8-17】](https://github.com/mack-a/v2ray-agent/blob/master/free_account.md)。 -- [建议安装脚本前先安装适合自己的BBR](https://github.com/mack-a/v2ray-agent/blob/master/bbr.md) +- [免费订阅链接【878.12 GB of 2 TB Used 2020-8-17】](https://github.com/mack-a/v2ray-agent/blob/master/documents/free_account.md)。 +- [建议安装脚本前先安装适合自己的BBR](https://github.com/mack-a/v2ray-agent/blob/documents/master/bbr.md) - 以上有问题可以提issues或者可以加入[TG群](https://t.me/technologyshare)反馈。 - [博客地址](https://blog.v2ray-agent.com/) +- 博客搭建【todo】 * * * # 目录 @@ -26,7 +27,7 @@ - 目前已在GCP上测试Centos[6【不稳定】、7、8]、Debian[9、10]、Ubuntu[16、18、19、20]通过，不开启Cloudflare的云朵则为直连。 - 这里添加了默认的智能解析自选CDN IP，脚本安装时可手动选择是否使用，本地dns解析建议使用 [114.114.114.114] - 如果智能解析后发现不能上网，第一可以升级客户端、第二可以将address填写自己的科学上网的域名，不再使用智能解析CDN的域名，~~Shadowrocket可以将伪装域名添加到外层的Peer【Shadowrocket不兼容所致，请升级客户端】~~。 -- 如果对默认的不满意，则可以[自己进行测试](https://github.com/mack-a/v2ray-agent/blob/master/optimize_V2Ray.md#1%E6%89%8B%E5%8A%A8%E8%87%AA%E9%80%89ip%E5%BB%BA%E8%AE%AE%E4%BD%BF%E7%94%A8%E8%AF%A5%E7%A7%8D%E6%96%B9%E6%B3%95)，寻找适合自己的CDN IP。 +- 如果对默认的不满意，则可以[自己进行测试](https://github.com/mack-a/v2ray-agent/blob/master/documents/optimize_V2Ray.md#1%E6%89%8B%E5%8A%A8%E8%87%AA%E9%80%89ip%E5%BB%BA%E8%AE%AE%E4%BD%BF%E7%94%A8%E8%AF%A5%E7%A7%8D%E6%96%B9%E6%B3%95)，寻找适合自己的CDN IP。 - [脚本更新日志](https://github.com/mack-a/v2ray-agent/releases) 域名|移动|移动测试|联通|电信 @@ -36,24 +37,6 @@ domain08.qiu4.ml|1.0.0.83|上午峰值2.3w，4k稍显卡顿、晚九点峰值1.5 ``` bash <(curl -L -s https://raw.githubusercontent.com/mack-a/v2ray-agent/master/install.sh) ``` -- 1.自动检测并安装所需环境 -- 2.自动安装Nginx、生成TLS证书，验证是否正常工作。 -- 3.自动安装V2Ray、配置文件、生成随机uuid、开机自启。 -- 4.自动验证是否服务搭建成功 -- 5.自动添加伪装博客。 -- 6.添加默认的CDN，自选ip智能解析。 -- 7.默认安装最新的V2Ray版本。 -- 8.定时任务，自动续期tls，tls证书状态 -- 9.状态展示（V2Ray、TLS、定时任务）路径日志 -- 10.常见错误处理 - -# 示例图 -- 未安装 - - -- 已安装 - - # 自建教程 # 1.V2Ray @@ -61,7 +44,7 @@ bash <(curl -L -s https://raw.githubusercontent.com/mack-a/v2ray-agent/master/in ## 方法1(Flexible)【建议使用该方法】 - 只使用CloudFlare的证书 -- 客户端->CloudFlare使用TLS+vmess加密，CloudFlare->VPS只使用vmess，[点击查看](https://github.com/mack-a/v2ray-agent/blob/master/Cloudflare_Flexible.md) +- 客户端->CloudFlare使用TLS+vmess加密，CloudFlare->VPS只使用vmess，[点击查看](https://github.com/mack-a/v2ray-agent/blob/master/documents/Cloudflare_Flexible.md) - 不需要自己维护自己的https证书 - 少一步解析证书的过程，速度理论上会快一点 @@ -71,16 +54,16 @@ bash <(curl -L -s https://raw.githubusercontent.com/mack-a/v2ray-agent/master/in - 与方法1不同的是，CloudFlare和VPS通讯时也会使用TLS加密。两个方法安全方面区别不是很大。 ## 方法3(Workers) -- [点击查看](https://github.com/mack-a/v2ray-agent/blob/master/cloudflare_workers.md) +- [点击查看](https://github.com/mack-a/v2ray-agent/blob/master/documents/cloudflare_workers.md) # 2.Trojan - 需要自己生成证书 -- 客户端->使用自己生成的tls加密无其他加密->VPS,[点击查看](https://github.com/mack-a/v2ray-agent/blob/master/Trojan.md) +- 客户端->使用自己生成的tls加密无其他加密->VPS,[点击查看](https://github.com/mack-a/v2ray-agent/blob/documents/master/Trojan.md) - 少一层加密，理论速度会快一些。 - 速度取决于VPS的线路。 - 需要自己维护证书。 - [官方Github](https://github.com/trojan-gfw/trojan) # 流量转发服务 -## 1.TLS+WS[点击查看](https://github.com/mack-a/v2ray-agent/blob/master/traffic_relay_tls_ws.md) -## 2.TCP+Vmess[点击查看](https://github.com/mack-a/v2ray-agent/blob/master/traffic_relay_tcp_vmess.md) +## 1.TLS+WS[点击查看](https://github.com/mack-a/v2ray-agent/blob/master/documents/traffic_relay_tls_ws.md) +## 2.TCP+Vmess[点击查看](https://github.com/mack-a/v2ray-agent/blob/master/documents/traffic_relay_tcp_vmess.md) diff --git a/Cloudflare_Flexible.md b/documents/Cloudflare_Flexible.md similarity index 100% rename from Cloudflare_Flexible.md rename to documents/Cloudflare_Flexible.md diff --git a/Cloudflare_Full.md b/documents/Cloudflare_Full.md similarity index 100% rename from Cloudflare_Full.md rename to documents/Cloudflare_Full.md diff --git a/Trojan.md b/documents/Trojan.md similarity index 100% rename from Trojan.md rename to documents/Trojan.md diff --git a/bbr.md b/documents/bbr.md similarity index 100% rename from bbr.md rename to documents/bbr.md diff --git a/cloudflare_workers.md b/documents/cloudflare_workers.md similarity index 100% rename from cloudflare_workers.md rename to documents/cloudflare_workers.md diff --git a/firewall.md b/documents/firewall.md similarity index 100% rename from firewall.md rename to documents/firewall.md diff --git a/free_account.md b/documents/free_account.md similarity index 100% rename from free_account.md rename to documents/free_account.md diff --git a/optimize_V2Ray.md b/documents/optimize_V2Ray.md similarity index 100% rename from optimize_V2Ray.md rename to documents/optimize_V2Ray.md diff --git a/recover_version.md b/documents/recover_version.md similarity index 100% rename from recover_version.md rename to documents/recover_version.md diff --git a/settings.md b/documents/settings.md similarity index 100% rename from settings.md rename to documents/settings.md diff --git a/traffic_relay_tcp_vmess.md b/documents/traffic_relay_tcp_vmess.md similarity index 100% rename from traffic_relay_tcp_vmess.md rename to documents/traffic_relay_tcp_vmess.md diff --git a/traffic_relay_tls_ws.md b/documents/traffic_relay_tls_ws.md similarity index 100% rename from traffic_relay_tls_ws.md rename to documents/traffic_relay_tls_ws.md diff --git a/blog/unable/html.zip b/fodder/blog/unable/html.zip similarity index 100% rename from blog/unable/html.zip rename to fodder/blog/unable/html.zip diff --git a/find_best_cdn_ip.sh b/shell/find_best_cdn_ip.sh similarity index 100% rename from find_best_cdn_ip.sh rename to shell/find_best_cdn_ip.sh diff --git a/init_gcp_ssh.sh b/shell/init_gcp_ssh.sh similarity index 100% rename from init_gcp_ssh.sh rename to shell/init_gcp_ssh.sh diff --git a/init_tls.sh b/shell/init_tls.sh similarity index 100% rename from init_tls.sh rename to shell/init_tls.sh diff --git a/install_trojan.sh b/shell/install_trojan.sh similarity index 100% rename from install_trojan.sh rename to shell/install_trojan.sh diff --git a/ping_tool.sh b/shell/ping_tool.sh similarity index 100% rename from ping_tool.sh rename to shell/ping_tool.sh diff --git a/test.sh b/test.sh deleted file mode 100755 index b026297..0000000 --- a/test.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash -domain="test3.am1z.xyz" -eccPath=`find ~/.acme.sh -name "${domain}_ecc"|head -1` -mkdir -p /tmp/tls -touch /tmp/tls/tls.log -touch /tmp/tls/acme.log -if [[ ! -z ${eccPath} ]] -then - modifyTime=`stat ${eccPath}/${domain}.key|sed -n '6,6p'|awk '{print $2" "$3" "$4" "$5}'` - modifyTime=`date +%s -d "${modifyTime}"` - currentTime=`date +%s` - stampDiff=`expr ${currentTime} - ${modifyTime}` - minutes=`expr ${stampDiff} / 60` - status="正常" - reloadTime="暂无" - if [[ ! -z ${modifyTime} ]] && [[ ! -z ${currentTime} ]] && [[ ! -z ${stampDiff} ]] && [[ ! -z ${minutes} ]] && [[ ${minutes} -lt '120' ]] - then - nginx -s stop - ~/.acme.sh/acme.sh --installcert -d ${domain} --fullchainpath /etc/nginx/v2ray-agent-https/${domain}.crt --keypath /etc/nginx/v2ray-agent-https/${domain}.key --ecc >> /tmp/tls/acme.log - nginx - reloadTime=`date -d @${currentTime} +"%F %H:%M:%S"` - fi - echo "域名：${domain}，modifyTime:"`date -d @${modifyTime} +"%F %H:%M:%S"`,"检查时间:"`date -d @${currentTime} +"%F %H:%M:%S"`,"上次生成证书的时:"`expr ${minutes} / 1440`"天前","证书状态："${status},"重新生成日期："${reloadTime} >> /tmp/tls/tls.log -else - echo '无法找到证书路径' >> /tmp/tls/tls.log -fi