diff --git a/Public/dep/wdd-server-host.txt b/Public/dep/wdd-server-host.txt index 76f2cbe..ee46222 100644 --- a/Public/dep/wdd-server-host.txt +++ b/Public/dep/wdd-server-host.txt @@ -1,4 +1,4 @@ -146.56.147.12 arm-s-1 s0 +132.145.87.10 arm-s-1 s0 10.0.0.91 arm-s-1 s0 146.56.159.175 arm-s-2 s5 diff --git a/Public/init-script-wdd.sh b/Public/init-script-wdd.sh index ccc1d8e..d1ba575 100644 --- a/Public/init-script-wdd.sh +++ b/Public/init-script-wdd.sh @@ -6,12 +6,13 @@ docker_version=20.10.10 -oss_url_prefix="http://10.250.0.100:9000/octopus" +#oss_url_prefix="http://10.250.0.100:9000/octopus" +oss_url_prefix="https://oss-s1.107421.xyz" modify_ssh_port=22333 octopus_agent_path=/usr/local/etc/octpus-agent octopus_agent_url=https://happybirthday.107421.xyz/octopus-agent agent_config_url=https://happybirthday.107421.xyz/agent-config -offline_host_ip="10.250.0.100" +offline_host_ip="https://oss-s1.107421.xyz" # 脚本执行内容 deploy_in_cn=0 diff --git a/v2ray示例/Xray-中级方案/Seoul0-实际使用的Xray配置.json b/v2ray示例/Xray-中级方案/Seoul1-实际使用的Xray配置.json similarity index 63% rename from v2ray示例/Xray-中级方案/Seoul0-实际使用的Xray配置.json rename to v2ray示例/Xray-中级方案/Seoul1-实际使用的Xray配置.json index c94f71a..680d5e8 100644 --- a/v2ray示例/Xray-中级方案/Seoul0-实际使用的Xray配置.json +++ b/v2ray示例/Xray-中级方案/Seoul1-实际使用的Xray配置.json @@ -3,7 +3,7 @@ { "protocol": "trojan", "listen": "0.0.0.0", - "port": 30000, + "port": 443, "settings": { "clients": [ { @@ -22,18 +22,18 @@ ], "certificates": [ { - "certificateFile": "/root/.acme.sh/xx.s0.yy.ac.107421.xyz_ecc/fullchain.cer", - "keyFile": "/root/.acme.sh/xx.s0.yy.ac.107421.xyz_ecc/xx.s0.yy.ac.107421.xyz.key" + "certificateFile": "/root/.acme.sh/xx.s4.cc.hh.107421.xyz_ecc/fullchain.cer", + "keyFile": "/root/.acme.sh/xx.s4.cc.hh.107421.xyz_ecc/xx.s4.cc.hh.107421.xyz.key" } ] } }, - "tag": "Seoul-arm64-01" + "tag": "Seoul-amd64-01" }, { "protocol": "trojan", "listen": "0.0.0.0", - "port": 29999, + "port": 19999, "settings": { "clients": [ { @@ -52,18 +52,18 @@ ], "certificates": [ { - "certificateFile": "/root/.acme.sh/xx.s0.yy.ac.107421.xyz_ecc/fullchain.cer", - "keyFile": "/root/.acme.sh/xx.s0.yy.ac.107421.xyz_ecc/xx.s0.yy.ac.107421.xyz.key" + "certificateFile": "/root/.acme.sh/xx.s4.cc.hh.107421.xyz_ecc/fullchain.cer", + "keyFile": "/root/.acme.sh/xx.s4.cc.hh.107421.xyz_ecc/xx.s4.cc.hh.107421.xyz.key" } ] } }, - "tag": "Seoul-arm64-01->Tokyo-amd64-02" + "tag": "Seoul-amd64-01->Tokyo-amd64-02" }, { "protocol": "trojan", "listen": "0.0.0.0", - "port": 29998, + "port": 19998, "settings": { "clients": [ { @@ -82,18 +82,18 @@ ], "certificates": [ { - "certificateFile": "/root/.acme.sh/xx.s0.yy.ac.107421.xyz_ecc/fullchain.cer", - "keyFile": "/root/.acme.sh/xx.s0.yy.ac.107421.xyz_ecc/xx.s0.yy.ac.107421.xyz.key" + "certificateFile": "/root/.acme.sh/xx.s4.cc.hh.107421.xyz_ecc/fullchain.cer", + "keyFile": "/root/.acme.sh/xx.s4.cc.hh.107421.xyz_ecc/xx.s4.cc.hh.107421.xyz.key" } ] } }, - "tag": "Seoul-arm64-01->Phoenix-amd64-02" + "tag": "Seoul-amd64-01->Phoenix-amd64-02" }, { "protocol": "trojan", "listen": "0.0.0.0", - "port": 29997, + "port": 19997, "settings": { "clients": [ { @@ -112,13 +112,13 @@ ], "certificates": [ { - "certificateFile": "/root/.acme.sh/xx.s0.yy.ac.107421.xyz_ecc/fullchain.cer", - "keyFile": "/root/.acme.sh/xx.s0.yy.ac.107421.xyz_ecc/xx.s0.yy.ac.107421.xyz.key" + "certificateFile": "/root/.acme.sh/xx.s4.cc.hh.107421.xyz_ecc/fullchain.cer", + "keyFile": "/root/.acme.sh/xx.s4.cc.hh.107421.xyz_ecc/xx.s4.cc.hh.107421.xyz.key" } ] } }, - "tag": "Seoul-arm64-01->London-amd64-01" + "tag": "Seoul-amd64-01->Osaka-amd64-01" } ], "outbounds": [ @@ -127,14 +127,14 @@ }, { "protocol": "freedom", - "tag": "Seoul-arm64-01" + "tag": "Seoul-amd64-01" }, { "protocol": "blackhole", "tag": "block" }, { - "tag": "Seoul-arm64-01->Tokyo-amd64-02", + "tag": "Seoul-amd64-01->Tokyo-amd64-02", "protocol": "socks", "settings": { "servers": [ @@ -146,7 +146,7 @@ } }, { - "tag": "Seoul-arm64-01->Phoenix-amd64-02", + "tag": "Seoul-amd64-01->Phoenix-amd64-02", "protocol": "socks", "settings": { "servers": [ @@ -158,7 +158,7 @@ } }, { - "tag": "Seoul-arm64-01->London-amd64-01", + "tag": "Seoul-amd64-01->London-amd64-01", "protocol": "socks", "settings": { "servers": [ @@ -168,6 +168,18 @@ } ] } + }, + { + "tag": "Seoul-amd64-01->Osaka-amd64-01", + "protocol": "socks", + "settings": { + "servers": [ + { + "address": "140.83.84.142", + "port": 1234 + } + ] + } } ], "routing": { @@ -176,30 +188,37 @@ { "type": "field", "inboundTag": [ - "Seoul-arm64-01" + "Seoul-amd64-01" ], - "outboundTag": "Seoul-arm64-01" + "outboundTag": "Seoul-amd64-01" }, { "type": "field", "inboundTag": [ - "Seoul-arm64-01->Tokyo-amd64-02" + "Seoul-amd64-01->Tokyo-amd64-02" ], - "outboundTag": "Seoul-arm64-01->Tokyo-amd64-02" + "outboundTag": "Seoul-amd64-01->Tokyo-amd64-02" }, { "type": "field", "inboundTag": [ - "Seoul-arm64-01->Phoenix-amd64-02" + "Seoul-amd64-01->Phoenix-amd64-02" ], - "outboundTag": "Seoul-arm64-01->Phoenix-amd64-02" + "outboundTag": "Seoul-amd64-01->Phoenix-amd64-02" }, { "type": "field", "inboundTag": [ - "Seoul-arm64-01->London-amd64-01" + "Seoul-amd64-01->London-amd64-01" ], - "outboundTag": "Seoul-arm64-01->London-amd64-01" + "outboundTag": "Seoul-amd64-01->London-amd64-01" + }, + { + "type": "field", + "inboundTag": [ + "Seoul-amd64-01->Osaka-amd64-01" + ], + "outboundTag": "Seoul-amd64-01->Osaka-amd64-01" } ] } diff --git a/v2ray示例/Xray-中级方案/Xray订阅地址.txt b/v2ray示例/Xray-中级方案/Xray订阅地址.txt index 1a03476..a77d0fb 100644 --- a/v2ray示例/Xray-中级方案/Xray订阅地址.txt +++ b/v2ray示例/Xray-中级方案/Xray订阅地址.txt @@ -1,7 +1,8 @@ -trojan://V2ryStr0ngP0ss@140.238.14.103:19999?security=tls&sni=xx.s4.cc.hh.107421.xyz&alpn=http%2F1.1&fp=chrome&type=tcp&headerType=none&host=xx.s4.cc.hh.107421.xyz#Tokyo-Trojan -trojan://V2ryStr0ngP0ss@140.238.14.103:443?security=tls&sni=xx.s4.cc.hh.107421.xyz&alpn=http%2F1.1&fp=chrome&type=tcp&headerType=none&host=xx.s4.cc.hh.107421.xyz#Seoul-Trojan vmess://ew0KICAidiI6ICIyIiwNCiAgInBzIjogInVzLWNlbnRlLWZyZWUiLA0KICAiYWRkIjogIm5vcnRoZmxhbmsuMTA3NDIxLnh5eiIsDQogICJwb3J0IjogIjQ0MyIsDQogICJpZCI6ICJkZTA0YWRkOS01YzY4LThiYWItOTUwYy0wOGNkNTMyMGRmMTgiLA0KICAiYWlkIjogIjAiLA0KICAic2N5IjogImF1dG8iLA0KICAibmV0IjogIndzIiwNCiAgInR5cGUiOiAibm9uZSIsDQogICJob3N0IjogIiIsDQogICJwYXRoIjogIi92bWVzcyIsDQogICJ0bHMiOiAidGxzIiwNCiAgInNuaSI6ICIiLA0KICAiYWxwbiI6ICIiDQp9 -trojan://V2ryStr0ngP0ss@140.238.14.103:19998?security=tls&sni=xx.s4.cc.hh.107421.xyz&alpn=http%2F1.1&fp=chrome&type=tcp&headerType=none&host=xx.s4.cc.hh.107421.xyz#Pheonix-Trojan +trojan://V2ryStr0ngP0ss@140.238.14.103:443?security=tls&sni=xx.s4.cc.hh.107421.xyz&alpn=h2%2Chttp%2F1.1&fp=chrome&type=tcp&headerType=none&host=xx.s4.cc.hh.107421.xyz#Seoul-Trojan +trojan://V2ryStr0ngP0ss@140.238.14.103:19997?security=tls&sni=xx.s4.cc.hh.107421.xyz&alpn=h2%2Chttp%2F1.1&fp=chrome&type=tcp&headerType=none&host=xx.s4.cc.hh.107421.xyz#Osaka-Trojan +trojan://V2ryStr0ngP0ss@140.238.14.103:19999?security=tls&sni=xx.s4.cc.hh.107421.xyz&alpn=h2%2Chttp%2F1.1&fp=chrome&type=tcp&headerType=none&host=xx.s4.cc.hh.107421.xyz#Tokyo-Trojan +trojan://V2ryStr0ngP0ss@140.238.14.103:19998?security=tls&sni=xx.s4.cc.hh.107421.xyz&alpn=h2%2Chttp%2F1.1&fp=chrome&type=tcp&headerType=none&host=xx.s4.cc.hh.107421.xyz#Pheonix-Trojan trojan://V2ryStr0ngP0ss@146.56.147.12:30000?security=tls&sni=xx.s0.yy.ac.107421.xyz&alpn=h2%2Chttp%2F1.1&fp=firefox&type=tcp&headerType=none&host=xx.s0.yy.ac.107421.xyz#Seoul-arm64-01-Trojan trojan://V2ryStr0ngP0ss@43.154.83.213:443?security=tls&sni=xx.tc.hk.go.107421.xyz&alpn=h2%2Chttp%2F1.1&fp=firefox&type=tcp&headerType=none#Tencent-Hkong-Trojan vless://fc903f5d-a007-482b-928c-570da9a851f9@43.154.83.213:29999?encryption=none&flow=xtls-rprx-vision&security=reality&sni=xx.tc.hk.go.107421.xyz&fp=chrome&pbk=IBKk7cbbpnarU9sxJx84tXztytBFH2oCNfy7FlLVjDg&sid=ad570cbfab&type=tcp&headerType=none#Tencent-HK-11.24 diff --git a/v2ray示例/Xray-中级方案/Xray证书申请模板.txt b/v2ray示例/Xray-中级方案/Xray证书申请模板.txt index 064a071..a78a294 100644 --- a/v2ray示例/Xray-中级方案/Xray证书申请模板.txt +++ b/v2ray示例/Xray-中级方案/Xray证书申请模板.txt @@ -3,7 +3,7 @@ # Seoul-arm64-01 xx.s0.yy.ac.107421.xyz # Seoul-amd64-04 xx.s4.cc.hh.107421.xyz -export DOMAIN_NAME=xx.s0.yy.ac.107421.xyz +export DOMAIN_NAME=xx.s4.cc.hh.107421.xyz export CF_Token="oXJRP5XI8Zhipa_PtYtB_jy6qWL0I9BosrJEYE8p" export CF_Account_ID="dfaadeb83406ef5ad35da02617af9191" @@ -12,8 +12,7 @@ export CF_Zone_ID="511894a4f1357feb905e974e16241ebb" acme.sh --issue --dns dns_cf -d ${DOMAIN_NAME} --keylength ec-256 - -export DOMAIN_NAME=xx.s0.yy.ac.107421.xyz +export DOMAIN_NAME=xx.s4.cc.hh.107421.xyz chmod -R 644 /root/.acme.sh/${DOMAIN_NAME}_ecc/fullchain.cer chmod -R 644 /root/.acme.sh/${DOMAIN_NAME}_ecc/${DOMAIN_NAME}.key