diff --git a/下载中心/youtube/1-systemd-daemon.service b/0-部署应用/下载中心/youtube/1-systemd-daemon.service similarity index 100% rename from 下载中心/youtube/1-systemd-daemon.service rename to 0-部署应用/下载中心/youtube/1-systemd-daemon.service diff --git a/下载中心/youtube/1-离线下载中心Rclone守护脚本.sh b/0-部署应用/下载中心/youtube/1-离线下载中心Rclone守护脚本.sh similarity index 100% rename from 下载中心/youtube/1-离线下载中心Rclone守护脚本.sh rename to 0-部署应用/下载中心/youtube/1-离线下载中心Rclone守护脚本.sh diff --git a/下载中心/youtube/2-systemd-daemon.service b/0-部署应用/下载中心/youtube/2-systemd-daemon.service similarity index 100% rename from 下载中心/youtube/2-systemd-daemon.service rename to 0-部署应用/下载中心/youtube/2-systemd-daemon.service diff --git a/下载中心/youtube/2-家庭Rclone守护脚本.sh b/0-部署应用/下载中心/youtube/2-家庭Rclone守护脚本.sh similarity index 100% rename from 下载中心/youtube/2-家庭Rclone守护脚本.sh rename to 0-部署应用/下载中心/youtube/2-家庭Rclone守护脚本.sh diff --git a/下载中心/youtube/metube-dockercompose.yaml b/0-部署应用/下载中心/youtube/metube-dockercompose.yaml similarity index 100% rename from 下载中心/youtube/metube-dockercompose.yaml rename to 0-部署应用/下载中心/youtube/metube-dockercompose.yaml diff --git a/下载中心/youtube/ytdl-material-docker-compose.yaml b/0-部署应用/下载中心/youtube/ytdl-material-docker-compose.yaml similarity index 100% rename from 下载中心/youtube/ytdl-material-docker-compose.yaml rename to 0-部署应用/下载中心/youtube/ytdl-material-docker-compose.yaml diff --git a/1-代理Xray/0-主机网络优化/内核转发优化.txt b/1-代理Xray/0-主机网络优化/内核转发优化.txt index d34b04f..6550c5f 100644 --- a/1-代理Xray/0-主机网络优化/内核转发优化.txt +++ b/1-代理Xray/0-主机网络优化/内核转发优化.txt @@ -69,7 +69,7 @@ sudo sysctl -p /etc/sysctl.d/proxy-wdd.conf sysctl net.ipv4.tcp_congestion_control -sudo ethtool -K eth0 gro on -sudo ethtool -K eth0 gso on -sudo ethtool -K eth0 tso on +sudo ethtool -K enp0s3 gro on +sudo ethtool -K enp0s3 gso on +sudo ethtool -K enp0s3 tso on diff --git a/1-代理Xray/0-香港节点/香港节点设计.png b/1-代理Xray/0-香港节点/香港节点设计.png index 331d6ec..ba3ab95 100644 Binary files a/1-代理Xray/0-香港节点/香港节点设计.png and b/1-代理Xray/0-香港节点/香港节点设计.png differ diff --git a/1-代理Xray/1-韩国中转/0-Vless回落中转.json b/1-代理Xray/1-韩国中转/0-Seoul4-Vless回落中转.json similarity index 79% rename from 1-代理Xray/1-韩国中转/0-Vless回落中转.json rename to 1-代理Xray/1-韩国中转/0-Seoul4-Vless回落中转.json index de119fc..7a7932b 100644 --- a/1-代理Xray/1-韩国中转/0-Vless回落中转.json +++ b/1-代理Xray/1-韩国中转/0-Seoul4-Vless回落中转.json @@ -18,9 +18,9 @@ "decryption": "none", "fallbacks": [ { - "name": "/tokyo2", - "dest": "@vless-tcp-tokyo2", - "xver": 2 + "name": "xx.t2.ll.c0.107421.xyz", + "alpn": "h2", + "dest": "@trojan-h2-tokyo2" }, { "path": "/phonix2", @@ -52,6 +52,11 @@ "ocspStapling": 3600, "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" + }, + { + "ocspStapling": 3600, + "certificateFile": "/root/.acme.sh/xx.t2.ll.c0.107421.xyz_ecc/fullchain.cer", + "keyFile": "/root/.acme.sh/xx.t2.ll.c0.107421.xyz_ecc/xx.t2.ll.c0.107421.xyz.key" } ], "minVersion": "1.2", @@ -76,8 +81,8 @@ "settings": { "clients": [ { - "email": "ice@qq.com", - "password": "Vad3.123a)asd1234-asdasd.asd1aczzS.123", + "email": "general@trojan-h2-tokyo2", + "password": "ADasfsaad12.21312@113.adsaddasds.112321", "level": 0 } ] @@ -86,36 +91,7 @@ "network": "h2", "security": "none", "httpSettings": { - "path": "/tokyo2" - } - } - }, - { - "listen": "@vless-tcp-tokyo2", - "protocol": "vless", - "settings": { - "clients": [ - { - "email": "general@vless-tcp-tokyo2", - "id": "1dde748d-32ee-4ed7-b70b-f2376d34e7e5", - "level": 0 - } - ], - "decryption": "none" - }, - "streamSettings": { - "network": "tcp", - "security": "none", - "tcpSettings": { - "acceptProxyProtocol": true, - "header": { - "type": "http", - "request": { - "path": [ - "/tokyo2" - ] - } - } + "path": "/vlh2tokyo2" } }, "sniffing": { @@ -224,18 +200,6 @@ ] } }, - { - "tag": "Seoul-amd64-01->London-amd64-01", - "protocol": "socks", - "settings": { - "servers": [ - { - "address": "141.147.99.91", - "port": 1234 - } - ] - } - }, { "tag": "Seoul-amd64-01->Osaka-amd64-01", "protocol": "socks", @@ -273,13 +237,6 @@ ], "outboundTag": "Seoul-amd64-01->Phoenix-amd64-02" }, - { - "type": "field", - "inboundTag": [ - "Seoul-amd64-01->London-amd64-01" - ], - "outboundTag": "Seoul-amd64-01->London-amd64-01" - }, { "type": "field", "inboundTag": [ diff --git a/1-代理Xray/4-凤凰城arm02节点/0-分层代理回落.json b/1-代理Xray/4-凤凰城arm02节点/0-分层代理回落.json new file mode 100644 index 0000000..d5b94a2 --- /dev/null +++ b/1-代理Xray/4-凤凰城arm02节点/0-分层代理回落.json @@ -0,0 +1,76 @@ +{ + "log": { + "loglevel": "error" + }, + "inbounds": [ + { + "port": 443, + "protocol": "vless", + "settings": { + "clients": [ + { + "id": "12491d80-745c-4e26-a58b-edf584afb208", + "flow": "xtls-rprx-vision", + "email": "cc@Phoenix-arm02.com", + "level": 0 + } + ], + "decryption": "none", + "fallbacks": [ + { + "dest": "/dev/shm/h2c.sock", + "xver": 2, + "alpn": "h2" + }, + { + "dest": "/dev/shm/h1.sock", + "xver": 2 + } + ] + }, + "streamSettings": { + "network": "tcp", + "security": "tls", + "tlsSettings": { + "certificates": [ + { + "ocspStapling": 3600, + "certificateFile": "/root/.acme.sh/zc.p4.cc.xx.107421.xyz_ecc/fullchain.cer", + "keyFile": "/root/.acme.sh/zc.p4.cc.xx.107421.xyz_ecc/zc.p4.cc.xx.107421.xyz.key" + } + ], + "minVersion": "1.2", + "cipherSuites": "TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256:TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", + "alpn": [ + "h2", + "http/1.1" + ] + } + }, + "sniffing": { + "enabled": true, + "destOverride": [ + "http", + "tls" + ] + } + }, + { + "tag": "proxy", + "protocol": "socks", + "listen": "0.0.0.0", + "port": 1234, + "settings": { + "auth": "noauth", + "udp": true, + "ip": "127.0.0.1", + "userLevel": 0 + } + } + ], + "outbounds": [ + { + "protocol": "freedom" + } + ] + } \ No newline at end of file diff --git a/1-代理Xray/4-凤凰城arm02节点/节点IP.txt b/1-代理Xray/4-凤凰城arm02节点/节点IP.txt new file mode 100644 index 0000000..b256f95 --- /dev/null +++ b/1-代理Xray/4-凤凰城arm02节点/节点IP.txt @@ -0,0 +1 @@ +129.146.57.94 来自于：美国 亚利桑那州 凤凰城 oracle.com \ No newline at end of file diff --git a/2-NGINX相关/107421.xyz/21-申请证书.sh b/2-NGINX相关/107421.xyz/21-申请证书.sh new file mode 100644 index 0000000..13ca214 --- /dev/null +++ b/2-NGINX相关/107421.xyz/21-申请证书.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +export DOMAIN_NAME=xx.tc.hk.go.107421.xyz +export DOMAIN_NAME=book.107421.xyz +export DOMAIN_NAME=octopus.107421.xyz +export DOMAIN_NAME=xx.t2.ll.c0.107421.xyz +export DOMAIN_NAME=zc.p4.cc.xx.107421.xyz + +export CF_Token="oXJRP5XI8Zhipa_PtYtB_jy6qWL0I9BosrJEYE8p" +export CF_Account_ID="dfaadeb83406ef5ad35da02617af9191" +export CF_Zone_ID="511894a4f1357feb905e974e16241ebb" + +acme.sh --issue --dns dns_cf -d ${DOMAIN_NAME} --keylength ec-256 + +acme.sh --install-cert -d ${DOMAIN_NAME} --ecc \ +--key-file /etc/nginx/conf.d/ssl_key/${DOMAIN_NAME}.key.pem \ +--fullchain-file /etc/nginx/conf.d/ssl_key/${DOMAIN_NAME}.cert.pem \ +--reloadcmd "systemctl restart nginx --force" \ No newline at end of file diff --git a/2-NGINX相关/107423.xyz/23-申请证书.sh b/2-NGINX相关/107423.xyz/23-申请证书.sh new file mode 100644 index 0000000..5aaa82a --- /dev/null +++ b/2-NGINX相关/107423.xyz/23-申请证书.sh @@ -0,0 +1,14 @@ + +export DOMAIN_NAME=xx.t2.ll.c0.107423.xyz + +export CF_Token="P1S8SgbXKWO2ScUKxu_EoHxI5FOebs6X6IuiO1lq" +export CF_Account_ID="dfaadeb83406ef5ad35da02617af9191" +export CF_Zone_ID="9383610816ba5c796ce201dfe1603fcb" + +acme.sh --issue --dns dns_cf -d ${DOMAIN_NAME} --keylength ec-256 --dnssleep 30 + + +acme.sh --install-cert -d ${DOMAIN_NAME} --ecc \ +--key-file /etc/nginx/conf.d/ssl_key/${DOMAIN_NAME}.key.pem \ +--fullchain-file /etc/nginx/conf.d/ssl_key/${DOMAIN_NAME}.cert.pem \ +--reloadcmd "systemctl restart nginx --force" \ No newline at end of file diff --git a/nginx/addNginxProxy copy.sh b/2-NGINX相关/nginx安装/addNginxProxy copy.sh similarity index 100% rename from nginx/addNginxProxy copy.sh rename to 2-NGINX相关/nginx安装/addNginxProxy copy.sh diff --git a/nginx/addNginxProxy.sh b/2-NGINX相关/nginx安装/addNginxProxy.sh similarity index 100% rename from nginx/addNginxProxy.sh rename to 2-NGINX相关/nginx安装/addNginxProxy.sh diff --git a/nginx/nginx-alpine-offical.dockerfile b/2-NGINX相关/nginx安装/nginx-alpine-offical.dockerfile similarity index 100% rename from nginx/nginx-alpine-offical.dockerfile rename to 2-NGINX相关/nginx安装/nginx-alpine-offical.dockerfile diff --git a/nginx/nginx的默认配置文件.conf b/2-NGINX相关/nginx安装/nginx的默认配置文件.conf similarity index 100% rename from nginx/nginx的默认配置文件.conf rename to 2-NGINX相关/nginx安装/nginx的默认配置文件.conf diff --git a/nginx/反向代理模板.conf b/2-NGINX相关/nginx安装/反向代理模板.conf similarity index 100% rename from nginx/反向代理模板.conf rename to 2-NGINX相关/nginx安装/反向代理模板.conf diff --git a/nginx/端口转发模板.conf b/2-NGINX相关/nginx安装/端口转发模板.conf similarity index 100% rename from nginx/端口转发模板.conf rename to 2-NGINX相关/nginx安装/端口转发模板.conf diff --git a/nginx/编译安装nginx.sh b/2-NGINX相关/nginx安装/编译安装nginx.sh similarity index 100% rename from nginx/编译安装nginx.sh rename to 2-NGINX相关/nginx安装/编译安装nginx.sh diff --git a/Public/dep/octopus-offline-nginx.conf b/3-wdd初始化/dep/octopus-offline-nginx.conf similarity index 100% rename from Public/dep/octopus-offline-nginx.conf rename to 3-wdd初始化/dep/octopus-offline-nginx.conf diff --git a/Public/dep/octopus_ssh_banner b/3-wdd初始化/dep/octopus_ssh_banner similarity index 100% rename from Public/dep/octopus_ssh_banner rename to 3-wdd初始化/dep/octopus_ssh_banner diff --git a/Public/dep/oh-my-zsh-plugins-list.txt b/3-wdd初始化/dep/oh-my-zsh-plugins-list.txt similarity index 100% rename from Public/dep/oh-my-zsh-plugins-list.txt rename to 3-wdd初始化/dep/oh-my-zsh-plugins-list.txt diff --git a/Public/dep/ssh_key_pub.txt b/3-wdd初始化/dep/ssh_key_pub.txt similarity index 100% rename from Public/dep/ssh_key_pub.txt rename to 3-wdd初始化/dep/ssh_key_pub.txt diff --git a/Public/dep/wdd-server-host.txt b/3-wdd初始化/dep/wdd-server-host.txt similarity index 100% rename from Public/dep/wdd-server-host.txt rename to 3-wdd初始化/dep/wdd-server-host.txt diff --git a/Public/init-script-wdd.sh b/3-wdd初始化/init-script-wdd.sh similarity index 100% rename from Public/init-script-wdd.sh rename to 3-wdd初始化/init-script-wdd.sh diff --git a/Public/lib/wdd-lib-clean.sh b/3-wdd初始化/lib/wdd-lib-clean.sh similarity index 100% rename from Public/lib/wdd-lib-clean.sh rename to 3-wdd初始化/lib/wdd-lib-clean.sh diff --git a/Public/lib/wdd-lib-env.sh b/3-wdd初始化/lib/wdd-lib-env.sh similarity index 100% rename from Public/lib/wdd-lib-env.sh rename to 3-wdd初始化/lib/wdd-lib-env.sh diff --git a/Public/lib/wdd-lib-file.sh b/3-wdd初始化/lib/wdd-lib-file.sh similarity index 100% rename from Public/lib/wdd-lib-file.sh rename to 3-wdd初始化/lib/wdd-lib-file.sh diff --git a/Public/lib/wdd-lib-log.sh b/3-wdd初始化/lib/wdd-lib-log.sh similarity index 100% rename from Public/lib/wdd-lib-log.sh rename to 3-wdd初始化/lib/wdd-lib-log.sh diff --git a/Public/lib/wdd-lib-sys.sh b/3-wdd初始化/lib/wdd-lib-sys.sh similarity index 100% rename from Public/lib/wdd-lib-sys.sh rename to 3-wdd初始化/lib/wdd-lib-sys.sh diff --git a/Public/mid-script.sh b/3-wdd初始化/mid-script.sh similarity index 100% rename from Public/mid-script.sh rename to 3-wdd初始化/mid-script.sh diff --git a/Public/sync-base-script.ps1 b/3-wdd初始化/sync-base-script.ps1 similarity index 100% rename from Public/sync-base-script.ps1 rename to 3-wdd初始化/sync-base-script.ps1 diff --git a/升级所有的deployment.sh b/升级所有的deployment.sh deleted file mode 100644 index 569d235..0000000 --- a/升级所有的deployment.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -app_list_backend=("cmii-uav-user" "cmii-admin-data" "cmii-admin-user" "cmii-uav-airspace" "cmii-uav-brain" "cmii-uav-clusters" "cmii-uav-data-post-process" "cmii-uav-developer" "cmii-uav-device" "cmii-uav-kpi-monitor" "cmii-uav-live" "cmii-uav-logger" "cmii-uav-mission" "cmii-uav-monitor" "cmii-uav-mqtthandler" "cmii-uav-notice" "cmii-uav-oauth" "cmii-uav-process" "cmii-uav-surveillance" "cmii-uav-user" "cmii-uav-waypoint" "cmii-uav-material-warehouse" "cmii-uav-gateway" "cmii-open-gateway" "cmii-admin-gateway") - -app_list_frontend=("cmii-uav-platform" "cmii-uav-platform-ai-brain" "cmii-uav-platform-hyperspectral" "cmii-uav-platform-mws" "cmii-uav-platform-mws-admin" "cmii-uav-platform-oms" "cmii-uav-platform-cms" "cmii-uav-platform-open" "cmii-uav-platform-splice") - -for app in ${app_list_frontend[@]}; do - echo ${app} - echo "--------------------------------------------------------------" - echo "" - echo "{\"spec\":{\"template\":{\"spec\":{\"containers\":[{\"name\":\"$app\",\"image\":\"harbor-manager.sre.cdcyy.cn/cmii/$app:2.1.14\"}]}}}}" - echo "--------------------------------------------------------------" - echo "" - - kubectl patch deployment $(kubectl get deployment -n cmii | grep -w "${app}" | awk '{print $1}') -n cmii -p "{\"spec\":{\"template\":{\"spec\":{\"containers\":[{\"name\":\"$app\",\"image\":\"harbor-manager.sre.cdcyy.cn/cmii/$app:2.1.14\"}]}}}}" - echo "升级完成！！" - echo "" -done - -kubectl get deployment -n uavcloud-dev | grep cmii-uav-user | awk '{print $1}' - -kubectl patch deployment $(kubectl get deployment -n iot | grep mns | awk '{print $1}') -n iot -p '{"spec":{"template":{"spec":{"containers":[{"name": "iotx-foundry-mns","image":"docker.io/csiot/iotx-foundry-mns:latest"}]}}}}' - -kk delete ing -n uavcloud-dev $(kk get ing -n uavcloud-dev | grep cmii | awk '{print$1}') - -kk delete configmap -n uavcloud-dev $(kk get configmap -n uavcloud-dev | grep tenant-prefix | awk '{print$1}')