From 21ff6a711d31201234acb15e8dcecbdecd80a20b Mon Sep 17 00:00:00 2001 From: zeaslity Date: Tue, 18 Feb 2025 09:49:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=87=8F=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../openai-web-dockercompose.yaml | 2 +- .../AppFlowy-Notion替代品/2-17-deploy.env | 191 +++++++++++ .../AppFlowy-Notion替代品/appflowy-client.yaml | 8 + .../AppFlowy-Notion替代品/deploy.env | 38 ++- 1-代理Xray/0-主机网络优化/内核转发优化.txt | 6 +- 1-代理Xray/1-韩国中转/0-Seoul4-Vless.json | 308 ++++++++++++++++++ 1-代理Xray/2-上海中转/0-Shanghai.json | 10 +- 1-代理Xray/2-上海中转/本机使用代理.txt | 4 + .../0-Tokyo2-Vless回落中转.json} | 0 1-代理Xray/98-subscribe-clash.yaml | 26 +- 1-代理Xray/99-subscribe-octopus-latest.txt | 7 +- 1-代理Xray/XRay-安装脚本/Xray安装脚本.txt | 3 + 2-NGINX相关/107421.xyz/21-申请证书.sh | 9 +- 3-wdd初始化-OSS/init-script-wdd.sh | 2 +- 14 files changed, 580 insertions(+), 34 deletions(-) create mode 100644 0-部署应用/Tokyo-arm64-01/AppFlowy-Notion替代品/2-17-deploy.env create mode 100644 0-部署应用/Tokyo-arm64-01/AppFlowy-Notion替代品/appflowy-client.yaml create mode 100644 1-代理Xray/1-韩国中转/0-Seoul4-Vless.json create mode 100644 1-代理Xray/2-上海中转/本机使用代理.txt rename 1-代理Xray/{1-韩国中转/0-Seoul4-Vless回落中转.json => 7-日本节点/0-Tokyo2-Vless回落中转.json} (100%) diff --git a/0-部署应用/Oracle-Cloud/openai-reverse-proxy/openai-web-dockercompose.yaml b/0-部署应用/Oracle-Cloud/openai-reverse-proxy/openai-web-dockercompose.yaml index 323e9b9..2a02766 100644 --- a/0-部署应用/Oracle-Cloud/openai-reverse-proxy/openai-web-dockercompose.yaml +++ b/0-部署应用/Oracle-Cloud/openai-reverse-proxy/openai-web-dockercompose.yaml @@ -2,7 +2,7 @@ version: '3.9' services: chatgpt-next-web: container_name: chatgpt-next-web - image: yidadaa/chatgpt-next-web + image: yidadaa/chatgpt-next-web:v2.16.0 ports: - 3002:3000 environment: diff --git a/0-部署应用/Tokyo-arm64-01/AppFlowy-Notion替代品/2-17-deploy.env b/0-部署应用/Tokyo-arm64-01/AppFlowy-Notion替代品/2-17-deploy.env new file mode 100644 index 0000000..658d8a8 --- /dev/null +++ b/0-部署应用/Tokyo-arm64-01/AppFlowy-Notion替代品/2-17-deploy.env @@ -0,0 +1,191 @@ +# This file is a template for docker compose deployment +# Copy this file to .env and change the values as needed + +# Fully qualified domain name for the deployment. Replace localhost with your domain, +# such as http://mydomain.com. +FQDN=http://localhost + +# PostgreSQL Settings +POSTGRES_HOST=postgres +POSTGRES_USER=postgres +POSTGRES_PASSWORD=password +POSTGRES_PORT=5432 +POSTGRES_DB=postgres + +# Postgres credential for supabase_auth_admin +SUPABASE_PASSWORD=root + +# Redis Settings +REDIS_HOST=redis +REDIS_PORT=6379 + +# Minio Host +MINIO_HOST=minio +MINIO_PORT=9000 + +AWS_ACCESS_KEY=minioadmin +AWS_SECRET=minioadmin + +# AppFlowy Cloud +## URL that connects to the gotrue docker container +APPFLOWY_GOTRUE_BASE_URL=http://gotrue:9999 +## URL that connects to the postgres docker container. If your password contains special characters, instead of using ${POSTGRES_PASSWORD}, +## you will need to convert them into url encoded format. For example, `p@ssword` will become `p%40ssword`. +APPFLOWY_DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} +APPFLOWY_ACCESS_CONTROL=true +APPFLOWY_WEBSOCKET_MAILBOX_SIZE=6000 +APPFLOWY_DATABASE_MAX_CONNECTIONS=40 +## URL that connects to the redis docker container +APPFLOWY_REDIS_URI=redis://${REDIS_HOST}:${REDIS_PORT} + +# admin frontend +## URL that connects to redis docker container +ADMIN_FRONTEND_REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT} +## URL that connects to gotrue docker container +ADMIN_FRONTEND_GOTRUE_URL=http://gotrue:9999 +## URL that connects to the cloud docker container +ADMIN_FRONTEND_APPFLOWY_CLOUD_URL=http://appflowy_cloud:8000 +## Base Url for the admin frontend. If you use the default Nginx conf provided here, this value should be /console. +## If you want to keep the previous behaviour where admin frontend is served at the root, don't set this env variable, +## or set it to empty string. +ADMIN_FRONTEND_PATH_PREFIX=/console + +# authentication key, change this and keep the key safe and secret +# self defined key, you can use any string +GOTRUE_JWT_SECRET=hello456 +# Expiration time in seconds for the JWT token +GOTRUE_JWT_EXP=7200 + +# User sign up will automatically be confirmed if this is set to true. +# If you have OAuth2 set up or smtp configured, you can set this to false +# to enforce email confirmation or OAuth2 login instead. +# If you set this to false, you need to either set up SMTP +GOTRUE_MAILER_AUTOCONFIRM=true +# Number of emails that can be per minute +GOTRUE_RATE_LIMIT_EMAIL_SENT=100 + +# If you intend to use mail confirmation, you need to set the SMTP configuration below +# You would then need to set GOTRUE_MAILER_AUTOCONFIRM=false +# Check for logs in gotrue service if there are any issues with email confirmation +# Note that smtps will be used for port 465, otherwise plain smtp with optional STARTTLS +GOTRUE_SMTP_HOST=smtp.gmail.com +GOTRUE_SMTP_PORT=465 +GOTRUE_SMTP_USER=email_sender@some_company.com +GOTRUE_SMTP_PASS=email_sender_password +GOTRUE_SMTP_ADMIN_EMAIL=comp_admin@some_company.com + +# This user will be created when GoTrue starts successfully +# You can use this user to login to the admin panel +GOTRUE_ADMIN_EMAIL=admin@example.com +GOTRUE_ADMIN_PASSWORD=password + +# Set this to true if users can only join by invite +GOTRUE_DISABLE_SIGNUP=false + +# External URL where the GoTrue service is exposed. +API_EXTERNAL_URL=${FQDN}/gotrue + +# GoTrue connect to postgres using this url. If your password contains special characters, +# replace ${SUPABASE_PASSWORD} with the url encoded version. For example, `p@ssword` will become `p%40ssword` +GOTRUE_DATABASE_URL=postgres://supabase_auth_admin:${SUPABASE_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} + +# Refer to this for details: https://github.com/AppFlowy-IO/AppFlowy-Cloud/blob/main/doc/AUTHENTICATION.md +# Google OAuth2 +GOTRUE_EXTERNAL_GOOGLE_ENABLED=false +GOTRUE_EXTERNAL_GOOGLE_CLIENT_ID= +GOTRUE_EXTERNAL_GOOGLE_SECRET= +GOTRUE_EXTERNAL_GOOGLE_REDIRECT_URI=${API_EXTERNAL_URL}/callback +# GitHub OAuth2 +GOTRUE_EXTERNAL_GITHUB_ENABLED=false +GOTRUE_EXTERNAL_GITHUB_CLIENT_ID= +GOTRUE_EXTERNAL_GITHUB_SECRET= +GOTRUE_EXTERNAL_GITHUB_REDIRECT_URI=${API_EXTERNAL_URL}/callback +# Discord OAuth2 +GOTRUE_EXTERNAL_DISCORD_ENABLED=false +GOTRUE_EXTERNAL_DISCORD_CLIENT_ID= +GOTRUE_EXTERNAL_DISCORD_SECRET= +GOTRUE_EXTERNAL_DISCORD_REDIRECT_URI=${API_EXTERNAL_URL}/callback +# Apple OAuth2 +GOTRUE_EXTERNAL_APPLE_ENABLED=false +GOTRUE_EXTERNAL_APPLE_CLIENT_ID= +GOTRUE_EXTERNAL_APPLE_SECRET= +GOTRUE_EXTERNAL_APPLE_REDIRECT_URI=${API_EXTERNAL_URL}/callback + +# File Storage +# Create the bucket if not exists on AppFlowy Cloud start up. +# Set this to false if the bucket has been created externally. +APPFLOWY_S3_CREATE_BUCKET=true +# This is where storage like images, files, etc. will be stored. +# By default, Minio is used as the default file storage which uses host's file system. +# Keep this as true if you are using other S3 compatible storage provider other than AWS. +APPFLOWY_S3_USE_MINIO=true +APPFLOWY_S3_MINIO_URL=http://${MINIO_HOST}:${MINIO_PORT} # change this if you are using a different address for minio +APPFLOWY_S3_ACCESS_KEY=${AWS_ACCESS_KEY} +APPFLOWY_S3_SECRET_KEY=${AWS_SECRET} +APPFLOWY_S3_BUCKET=appflowy +# Uncomment this if you are using AWS S3 +# APPFLOWY_S3_REGION=us-east-1 +# Uncomment this if you are using the Minio service hosted within this docker compose file +# This is so that, the presigned URL generated by AppFlowy Cloud will use the publicly availabe minio endpoint. +# APPFLOWY_S3_PRESIGNED_URL_ENDPOINT=${FQDN}/minio-api + +# AppFlowy Cloud Mailer +# Note that smtps (TLS) is always required, even for ports other than 465 +APPFLOWY_MAILER_SMTP_HOST=smtp.gmail.com +APPFLOWY_MAILER_SMTP_PORT=465 +APPFLOWY_MAILER_SMTP_USERNAME=email_sender@some_company.com +APPFLOWY_MAILER_SMTP_EMAIL=email_sender@some_company.com +APPFLOWY_MAILER_SMTP_PASSWORD=email_sender_password +APPFLOWY_MAILER_SMTP_TLS_KIND=wrapper # "none" "wrapper" "required" "opportunistic" + +# Log level for the appflowy-cloud service +RUST_LOG=info + +# PgAdmin +# Optional module to manage the postgres database +# You can access the pgadmin at http://your-host/pgadmin +# Refer to the APPFLOWY_DATABASE_URL for password when connecting to the database +PGADMIN_DEFAULT_EMAIL=admin@example.com +PGADMIN_DEFAULT_PASSWORD=password + +# Portainer (username: admin) +PORTAINER_PASSWORD=password1234 + +# Cloudflare tunnel token +CLOUDFLARE_TUNNEL_TOKEN= + +# NGINX +# Optional, change this if you want to use custom ports to expose AppFlowy +NGINX_PORT=80 +NGINX_TLS_PORT=443 + +# AppFlowy AI +AI_OPENAI_API_KEY= +AI_SERVER_PORT=5001 +AI_SERVER_HOST=ai +AI_DATABASE_URL=postgresql+psycopg://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} +AI_REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT} +LOCAL_AI_TEST_ENABLED=false +AI_APPFLOWY_BUCKET_NAME=${APPFLOWY_S3_BUCKET} +AI_APPFLOWY_HOST=${FQDN} +AI_MINIO_URL=http://${MINIO_HOST}:${MINIO_PORT} + +# AppFlowy Indexer +APPFLOWY_INDEXER_ENABLED=true +APPFLOWY_INDEXER_DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} +APPFLOWY_INDEXER_REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT} +APPFLOWY_INDEXER_EMBEDDING_BUFFER_SIZE=5000 + +# AppFlowy Collaborate +APPFLOWY_COLLABORATE_MULTI_THREAD=false +APPFLOWY_COLLABORATE_REMOVE_BATCH_SIZE=100 + +# AppFlowy Worker +APPFLOWY_WORKER_REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT} +APPFLOWY_WORKER_DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} + +# AppFlowy Web +# If your AppFlowy Web is hosted on a different domain, update this variable to the correct domain +APPFLOWY_WEB_URL=${FQDN} +# If you are running AppFlowy Web locally for development purpose, use the following value instead +# APPFLOWY_WEB_URL=http://localhost:3000 \ No newline at end of file diff --git a/0-部署应用/Tokyo-arm64-01/AppFlowy-Notion替代品/appflowy-client.yaml b/0-部署应用/Tokyo-arm64-01/AppFlowy-Notion替代品/appflowy-client.yaml new file mode 100644 index 0000000..93ad49b --- /dev/null +++ b/0-部署应用/Tokyo-arm64-01/AppFlowy-Notion替代品/appflowy-client.yaml @@ -0,0 +1,8 @@ +docker run --rm \ + -v $HOME/.Xauthority:/root/.Xauthority:rw \ + -v /tmp/.X11-unix:/tmp/.X11-unix \ + -v /dev/dri:/dev/dri \ + -v /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket \ + -v appflowy-data:/home/appflowy \ + -e DISPLAY=${DISPLAY} \ + appflowyio/appflowy_client:main \ No newline at end of file diff --git a/0-部署应用/Tokyo-arm64-01/AppFlowy-Notion替代品/deploy.env b/0-部署应用/Tokyo-arm64-01/AppFlowy-Notion替代品/deploy.env index 61fa461..b4e366e 100644 --- a/0-部署应用/Tokyo-arm64-01/AppFlowy-Notion替代品/deploy.env +++ b/0-部署应用/Tokyo-arm64-01/AppFlowy-Notion替代品/deploy.env @@ -1,6 +1,10 @@ # This file is a template for docker compose deployment # Copy this file to .env and change the values as needed +# Fully qualified domain name for the deployment. Replace localhost with your domain, +# such as http://mydomain.com. +FQDN=http://0.0.0.0:23000 + # PostgreSQL Settings POSTGRES_HOST=postgres POSTGRES_USER=postgres @@ -15,6 +19,13 @@ SUPABASE_PASSWORD=V2ryStr@Pss REDIS_HOST=redis REDIS_PORT=6379 +# Minio Host +MINIO_HOST=https://cnk8d6fazu16.compat.objectstorage.ap-seoul-1.oraclecloud.com +MINIO_PORT=443 + +AWS_ACCESS_KEY=9e413c6e66269bc65d7ec951d93ba9c6a9781f6e +AWS_SECRET=dkXD7PysjrhsTKfNIbKupUmtxdfOvYCyLXf0MXa4hnU + # AppFlowy Cloud ## URL that connects to the gotrue docker container APPFLOWY_GOTRUE_BASE_URL=http://gotrue:9999 @@ -31,6 +42,12 @@ APPFLOWY_REDIS_URI=redis://${REDIS_HOST}:${REDIS_PORT} ADMIN_FRONTEND_REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT} ## URL that connects to gotrue docker container ADMIN_FRONTEND_GOTRUE_URL=http://gotrue:9999 +## URL that connects to the cloud docker container +ADMIN_FRONTEND_APPFLOWY_CLOUD_URL=http://appflowy_cloud:8000 +## Base Url for the admin frontend. If you use the default Nginx conf provided here, this value should be /console. +## If you want to keep the previous behaviour where admin frontend is served at the root, don't set this env variable, +## or set it to empty string. +ADMIN_FRONTEND_PATH_PREFIX=/console # authentication key, change this and keep the key safe and secret # self defined key, you can use any string @@ -42,7 +59,7 @@ GOTRUE_JWT_EXP=7200 # If you have OAuth2 set up or smtp configured, you can set this to false # to enforce email confirmation or OAuth2 login instead. # If you set this to false, you need to either set up SMTP -GOTRUE_MAILER_AUTOCONFIRM=true +GOTRUE_MAILER_AUTOCONFIRM=false # Number of emails that can be per minute GOTRUE_RATE_LIMIT_EMAIL_SENT=100 @@ -66,7 +83,7 @@ GOTRUE_ADMIN_PASSWORD=lovemm.23 # If you are using a different domain, you need to change the redirect_uri in the OAuth2 configuration # Make sure that this domain is accessible to the user # Make sure no endswith / -API_EXTERNAL_URL=https://note.107421.xyz +API_EXTERNAL_URL=${FQDN}/gotrue # In docker environment, `postgres` is the hostname of the postgres service # GoTrue connect to postgres using this url @@ -102,15 +119,15 @@ APPFLOWY_S3_CREATE_BUCKET=false # By default, Minio is used as the default file storage which uses host's file system. # Keep this as true if you are using other S3 compatible storage provider other than AWS. APPFLOWY_S3_USE_MINIO=true -APPFLOWY_S3_MINIO_URL=https://cnk8d6fazu16.compat.objectstorage.ap-seoul-1.oraclecloud.com -APPFLOWY_S3_ACCESS_KEY=9e413c6e66269bc65d7ec951d93ba9c6a9781f6e -APPFLOWY_S3_SECRET_KEY=dkXD7PysjrhsTKfNIbKupUmtxdfOvYCyLXf0MXa4hnU= +APPFLOWY_S3_MINIO_URL=http://${MINIO_HOST}:${MINIO_PORT} +APPFLOWY_S3_ACCESS_KEY=${AWS_ACCESS_KEY} +APPFLOWY_S3_SECRET_KEY=${AWS_SECRET} APPFLOWY_S3_BUCKET=seoul-2 APPFLOWY_S3_REGION=ap-seoul-1 # AppFlowy Cloud Mailer # Note that smtps (TLS) is always required, even for ports other than 465 -APPFLOWY_MAILER_SMTP_HOST=smtp.gmail.com +APPFLOWY_MAILER_SMTP_HOST=https://smtp.gmail.com APPFLOWY_MAILER_SMTP_PORT=465 APPFLOWY_MAILER_SMTP_USERNAME=zeaslity@gmail.com APPFLOWY_MAILER_SMTP_PASSWORD=loveff.cxc.56320 @@ -146,11 +163,10 @@ APPFLOWY_AI_SERVER_PORT=5001 APPFLOWY_AI_SERVER_HOST=ai APPFLOWY_AI_DATABASE_URL=postgresql+psycopg://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} APPFLOWY_LOCAL_AI_TEST_ENABLED=false +AI_APPFLOWY_BUCKET_NAME=${APPFLOWY_S3_BUCKET} +AI_APPFLOWY_HOST=${FQDN} +AI_MINIO_URL=http://${MINIO_HOST}:${MINIO_PORT} -# AppFlowy History -APPFLOWY_GRPC_HISTORY_ADDRS=http://localhost:50051 -APPFLOWY_HISTORY_REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT} -APPFLOWY_HISTORY_DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} # AppFlowy Indexer APPFLOWY_INDEXER_ENABLED=true @@ -166,4 +182,4 @@ APPFLOWY_WORKER_REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT} APPFLOWY_WORKER_DATABASE_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} # AppFlowy Web -APPFLOWY_WEB_URL=http://localhost:3000 \ No newline at end of file +APPFLOWY_WEB_URL=${FQDN} \ No newline at end of file diff --git a/1-代理Xray/0-主机网络优化/内核转发优化.txt b/1-代理Xray/0-主机网络优化/内核转发优化.txt index d34b04f..10efb48 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 ens3 gro on +sudo ethtool -K ens3 gso on +sudo ethtool -K ens3 tso on diff --git a/1-代理Xray/1-韩国中转/0-Seoul4-Vless.json b/1-代理Xray/1-韩国中转/0-Seoul4-Vless.json new file mode 100644 index 0000000..48c65ec --- /dev/null +++ b/1-代理Xray/1-韩国中转/0-Seoul4-Vless.json @@ -0,0 +1,308 @@ +{ + "log": { + "loglevel": "error" + }, + "inbounds": [ + { + "port": 443, + "tag": "Seoul-amd64-01", + "protocol": "vless", + "settings": { + "clients": [ + { + "id": "1089cc14-557e-47ac-ac85-c07957b3cce3", + "flow": "xtls-rprx-vision", + "email": "cc@vless.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/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" + } + ], + "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" + ] + } + }, + { + "port": 20443, + "protocol": "vless", + "tag": "Seoul-amd64-01->Tokyo-amd64-02", + "settings": { + "clients": [ + { + "id": "21dab95b-088e-47bd-8351-609fd23cb33c", + "flow": "xtls-rprx-vision", + "email": "cc@vless.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/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", + "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" + ] + } + }, + { + "port": 21443, + "protocol": "vless", + "tag": "Seoul-amd64-01->Osaka-amd64-01", + "settings": { + "clients": [ + { + "id": "4c2dd763-56e5-408f-bc8f-dbf4c1fe41f9", + "flow": "xtls-rprx-vision", + "email": "cc@vless.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/xx.o1.vl.s4.107421.xyz_ecc/fullchain.cer", + "keyFile": "/root/.acme.sh/xx.o1.vl.s4.107421.xyz_ecc/xx.o1.vl.s4.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" + ] + } + }, + { + "port": 22443, + "protocol": "vless", + "tag": "Seoul-amd64-01->Phoenix-amd64-02", + "settings": { + "clients": [ + { + "id": "de576486-e254-4d9d-949a-37088358ec23", + "flow": "xtls-rprx-vision", + "email": "phoneix@vless.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/xx.p2.vl.s4.107421.xyz_ecc/fullchain.cer", + "keyFile": "/root/.acme.sh/xx.p2.vl.s4.107421.xyz_ecc/xx.p2.vl.s4.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" + ] + } + } + ], + "outbounds": [ + { + "protocol": "freedom" + }, + { + "protocol": "freedom", + "tag": "Seoul-amd64-01" + }, + { + "protocol": "blackhole", + "tag": "block" + }, + { + "tag": "Seoul-amd64-01->Tokyo-amd64-02", + "protocol": "socks", + "settings": { + "servers": [ + { + "address": "140.238.52.228", + "port": 1234 + } + ] + } + }, + { + "tag": "Seoul-amd64-01->Phoenix-amd64-02", + "protocol": "socks", + "settings": { + "servers": [ + { + "address": "129.146.171.163", + "port": 1234 + } + ] + } + }, + { + "tag": "Seoul-amd64-01->Osaka-amd64-01", + "protocol": "socks", + "settings": { + "servers": [ + { + "address": "140.83.84.142", + "port": 1234 + } + ] + } + } + ], + "routing": { + "domainStrategy": "IPIfNonMatch", + "rules": [ + { + "type": "field", + "inboundTag": [ + "Seoul-amd64-01" + ], + "outboundTag": "Seoul-amd64-01" + }, + { + "type": "field", + "inboundTag": [ + "Seoul-amd64-01->Tokyo-amd64-02" + ], + "outboundTag": "Seoul-amd64-01->Tokyo-amd64-02" + }, + { + "type": "field", + "inboundTag": [ + "Seoul-amd64-01->Phoenix-amd64-02" + ], + "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": [ + "Seoul-amd64-01->Osaka-amd64-01" + ], + "outboundTag": "Seoul-amd64-01->Osaka-amd64-01" + } + ] + } +} \ No newline at end of file diff --git a/1-代理Xray/2-上海中转/0-Shanghai.json b/1-代理Xray/2-上海中转/0-Shanghai.json index 9798785..5851821 100644 --- a/1-代理Xray/2-上海中转/0-Shanghai.json +++ b/1-代理Xray/2-上海中转/0-Shanghai.json @@ -18,7 +18,7 @@ "accounts": [ { "user": "zeaslity", - "pass": "lovemm.23" + "pass": "a1f090ea-e39c-49e7-a3be-9af26b6ce563" } ], "udp": true, @@ -43,7 +43,7 @@ "accounts": [ { "user": "zeaslity", - "pass": "lovemm.23" + "pass": "a1f090ea-e39c-49e7-a3be-9af26b6ce563" } ], "udp": true, @@ -68,7 +68,7 @@ "accounts": [ { "user": "zeaslity", - "pass": "lovemm.23" + "pass": "a1f090ea-e39c-49e7-a3be-9af26b6ce563" } ], "udp": true, @@ -87,7 +87,7 @@ "port": 443, "users": [ { - "id": "717c40e7-efeb-45bc-8f5e-4e6e7d9eea18", + "id": "0c5741d0-76a9-4945-9c1d-14647afcce24", "email": "t@t.tt", "security": "auto", "encryption": "none", @@ -124,7 +124,7 @@ "port": 443, "users": [ { - "id": "8a681ef0-cb4b-4768-9553-49acb7b9a1ad", + "id": "b1417d92-998d-410b-a5f3-cf144b6f043e", "email": "t@t.tt", "security": "auto", "encryption": "none", diff --git a/1-代理Xray/2-上海中转/本机使用代理.txt b/1-代理Xray/2-上海中转/本机使用代理.txt new file mode 100644 index 0000000..e3a401a --- /dev/null +++ b/1-代理Xray/2-上海中转/本机使用代理.txt @@ -0,0 +1,4 @@ + + + +export all_proxy=socks5://zeaslity:a1f090ea-e39c-49e7-a3be-9af26b6ce563@42.192.52.227:22888 \ No newline at end of file diff --git a/1-代理Xray/1-韩国中转/0-Seoul4-Vless回落中转.json b/1-代理Xray/7-日本节点/0-Tokyo2-Vless回落中转.json similarity index 100% rename from 1-代理Xray/1-韩国中转/0-Seoul4-Vless回落中转.json rename to 1-代理Xray/7-日本节点/0-Tokyo2-Vless回落中转.json diff --git a/1-代理Xray/98-subscribe-clash.yaml b/1-代理Xray/98-subscribe-clash.yaml index 1b636c9..e43bb40 100644 --- a/1-代理Xray/98-subscribe-clash.yaml +++ b/1-代理Xray/98-subscribe-clash.yaml @@ -55,17 +55,19 @@ dns: proxies: - {"type":"vmess","name":"us-central-free","ws-opts":{"path":"/vmess"},"server":"northflank.107421.xyz","port":443,"uuid":"de04add9-5c68-8bab-950c-08cd5320df18","alterId":0,"cipher":"auto","network":"ws","tls":true} - {"type":"socks5","name":"onetools-35-71","server":"192.168.35.71","port":22888,"username":"zeaslity","password":"password","udp":true} - - {"type":"socks5","name":"TC-SH","server":"42.192.52.227","port":22887,"username":"zeaslity","password":"lovemm.23","udp":true} - - {"type":"socks5","name":"TC-SH-LosA-BanH","server":"42.192.52.227","port":22888,"username":"zeaslity","password":"lovemm.23","udp":true} - - {"type":"socks5","name":"TC-SH-Germany","server":"42.192.52.227","port":22889,"username":"zeaslity","password":"lovemm.23","udp":true} + - {"type":"socks5","name":"TC-SH","server":"42.192.52.227","port":22887,"username":"zeaslity","password":"a1f090ea-e39c-49e7-a3be-9af26b6ce563","udp":true} + - {"type":"socks5","name":"TC-SH-LosA-BanH","server":"42.192.52.227","port":22888,"username":"zeaslity","password":"a1f090ea-e39c-49e7-a3be-9af26b6ce563","udp":true} + - {"type":"socks5","name":"TC-SH-Germany","server":"42.192.52.227","port":22889,"username":"zeaslity","password":"a1f090ea-e39c-49e7-a3be-9af26b6ce563","udp":true} - {"type":"trojan","name":"TC-HK-Trojan","server":"43.154.83.213","port":443,"password":"VaC3.123a-asd1234-asdasd.aAsDazzS.123","udp":true,"skip-cert-verify":false,"sni":"xx.tc.hk.go.107421.xyz","network":"http","ws-opts":{"path":"status"}} - {"type":"vless","name":"TC-HK-Vless","server":"43.154.83.213","port":443,"uuid":"8c1b580b-c59d-4b89-b020-980fa947539f","skip-cert-verify":false,"network":"tcp","flow":"xtls-rprx-vision","servername":"book.107421.xyz","tls":true,"udp":true} - {"type":"vless","name":"Care-Germany-Vless","server":"45.134.50.233","port":443,"uuid":"b1417d92-998d-410b-a5f3-cf144b6f043e","skip-cert-verify":false,"network":"tcp","flow":"xtls-rprx-vision","servername":"bingo.107421.xyz","tls":true,"udp":true} - {"type":"vless","name":"Oracle-Seoul-ARM01-Vless","server":"132.145.87.10","port":443,"uuid":"1089cc14-557e-47ac-ac85-c07957b3cce3","skip-cert-verify":false,"network":"tcp","flow":"xtls-rprx-vision","servername":"xx.s0.yy.ac.107421.xyz","tls":true,"udp":true} - {"type":"vless","name":"Oracle-Seoul-Vless","server":"140.238.14.103","port":443,"uuid":"1089cc14-557e-47ac-ac85-c07957b3cce3","skip-cert-verify":false,"network":"tcp","flow":"xtls-rprx-vision","servername":"xx.s4.cc.hh.107421.xyz","tls":true,"udp":true} - {"type":"vless","name":"BanH-LosA-Vless","server":"89.208.251.209","port":443,"uuid":"0c5741d0-76a9-4945-9c1d-14647afcce24","skip-cert-verify":false,"network":"tcp","flow":"xtls-rprx-vision","servername":"octopus.107421.xyz","tls":true,"udp":true} - - {"type":"trojan","name":"BanH-LosA-Trojan","server":"89.208.251.209","port":443,"password":"Vad3.123acasd-1234-as.dAsd.asdazzS.123","udp":true,"skip-cert-verify":false,"sni":"xx.l4.cc.nn.107421.xyz","network":"http","ws-opts":{"path":"status","headers":{"host":"xx.l4.cc.nn.107421.xyz"}}} - - {"type":"trojan","name":"Oracle-Tokyo-Trojan","server":"140.238.14.103","port":443,"password":"ADaSfsaad12.21312-.1Ac13.adsCCddasds.112321","udp":true,"skip-cert-verify":false,"sni":"xx.t2.ll.c0.107421.xyz","network":"http","ws-opts":{"path":"vlh2tokyo2","headers":{"host":"xx.t2.ll.c0.107421.xyz"}}} + - {"type":"trojan","name":"BanH-LosA-Trojan","server":"89.208.251.209","port":443,"password":"Vad3.123acasd-1234-as.dAsd.asdazzS.123","udp":true,"skip-cert-verify":false,"sni":"xx.l4.cc.nn.107421.xyz","network":"h2","ws-opts":{"path":"status","headers":{"host":"xx.l4.cc.nn.107421.xyz"}}} + - {"type":"vless","name":"Oracle-Tokyo-By-Seoul-Vless","server":"140.238.14.103","port":20443,"uuid":"21dab95b-088e-47bd-8351-609fd23cb33c","skip-cert-verify":false,"network":"tcp","flow":"xtls-rprx-vision","servername":"xx.t2.ll.c0.107421.xyz","tls":true,"udp":true} + - {"type":"vless","name":"Oracle-Osaka-By-Seoul-Vless","server":"140.238.14.103","port":21443,"uuid":"4c2dd763-56e5-408f-bc8f-dbf4c1fe41f9","skip-cert-verify":false,"network":"tcp","flow":"xtls-rprx-vision","servername":"xx.o1.vl.s4.107421.xyz","tls":true,"udp":true} + - {"type":"vless","name":"Oracle-Phoneix-By-Seoul-Vless","server":"140.238.14.103","port":22443,"uuid":"de576486-e254-4d9d-949a-37088358ec23","skip-cert-verify":false,"network":"tcp","flow":"xtls-rprx-vision","servername":"xx.p2.vl.s4.107421.xyz","tls":true,"udp":true} - {"type":"vless","name":"Oracle-Pheonix-ARM02-Vless","server":"129.146.57.94","port":443,"uuid":"12491d80-745c-4e26-a58b-edf584afb208","skip-cert-verify":false,"network":"tcp","flow":"xtls-rprx-vision","servername":"zc.p4.cc.xx.107421.xyz","tls":true,"udp":true} proxy-groups: - name: 🚀 节点选择 @@ -75,14 +77,16 @@ proxy-groups: - BanH-LosA-Vless - BanH-LosA-Trojan - us-central-free - - Oracle-Seoul-Vless - Oracle-Seoul-ARM01-Vless - Care-Germany-Vless - TC-SH - TC-SH-LosA-BanH - TC-SH-Germany - TC-HK-Trojan - - Oracle-Tokyo-Trojan + - Oracle-Seoul-Vless + - Oracle-Tokyo-By-Seoul-Vless + - Oracle-Osaka-By-Seoul-Vless + - Oracle-Phoneix-By-Seoul-Vless - Oracle-Pheonix-ARM02-Vless - onetools-35-71 - ♻️ 自动选择 @@ -99,7 +103,9 @@ proxy-groups: - Oracle-Seoul-Vless - Oracle-Seoul-ARM01-Vless - Care-Germany-Vless - - Oracle-Tokyo-Trojan + - Oracle-Tokyo-By-Seoul-Vless + - Oracle-Osaka-By-Seoul-Vless + - Oracle-Phoneix-By-Seoul-Vless - Oracle-Pheonix-ARM02-Vless - BanH-LosA-Vless - TC-HK-Vless @@ -118,7 +124,9 @@ proxy-groups: - BanH-LosA-Vless - TC-HK-Trojan - TC-HK-Vless - - Oracle-Tokyo-Trojan + - Oracle-Tokyo-By-Seoul-Vless + - Oracle-Osaka-By-Seoul-Vless + - Oracle-Phoneix-By-Seoul-Vless - Oracle-Pheonix-ARM02-Vless - name: 📲 电报信息 type: select diff --git a/1-代理Xray/99-subscribe-octopus-latest.txt b/1-代理Xray/99-subscribe-octopus-latest.txt index 5545871..8c5a134 100644 --- a/1-代理Xray/99-subscribe-octopus-latest.txt +++ b/1-代理Xray/99-subscribe-octopus-latest.txt @@ -1,11 +1,12 @@ vmess://eyJ2IjoiMiIsInBzIjoidXMtY2VudGUtZnJlZSIsImFkZCI6Im5vcnRoZmxhbmsuMTA3NDIxLnh5eiIsInBvcnQiOjQ0MywiaWQiOiJkZTA0YWRkOS01YzY4LThiYWItOTUwYy0wOGNkNTMyMGRmMTgiLCJhaWQiOjAsInNjeSI6ImF1dG8iLCJuZXQiOiJ3cyIsInBhdGgiOiIvdm1lc3MiLCJ0bHMiOiJ0bHMifQ== trojan://VaC3.123a-asd1234-asdasd.aAsDazzS.123@43.154.83.213:443?flow=xtls-rprx-vision&security=tls&sni=xx.tc.hk.go.107421.xyz&alpn=h2&fp=firefox&type=http&path=status#TC-HK-Trojan -vless://b4bdf874-8c03-5bd8-8fd7-5e409dfd82c0@43.154.83.213:443?encryption=none&flow=xtls-rprx-vision&security=tls&sni=book.107421.xyz&alpn=h2%2Chttp%2F1.1&fp=firefox&type=tcp&headerType=none#TC-HK-Vless +vless://8c1b580b-c59d-4b89-b020-980fa947539f@43.154.83.213:443?encryption=none&flow=xtls-rprx-vision&security=tls&sni=book.107421.xyz&alpn=h2%2Chttp%2F1.1&fp=firefox&type=tcp&headerType=none#TC-HK-Vless vless://b1417d92-998d-410b-a5f3-cf144b6f043e@45.134.50.233:443?encryption=none&flow=xtls-rprx-vision&security=tls&sni=bingo.107421.xyz&alpn=h2%2Chttp%2F1.1&fp=firefox&type=tcp&headerType=none#Care-Germany-Vless vless://1089cc14-557e-47ac-ac85-c07957b3cce3@140.238.14.103:443?encryption=none&flow=xtls-rprx-vision&security=tls&sni=xx.s4.cc.hh.107421.xyz&alpn=h2&fp=firefox&type=tcp&headerType=none&host=xx.s4.cc.hh.107421.xyz#Oracle-Seoul-Vless -socks://emVhc2xpdHk6bG92ZW1tLjIz@42.192.52.227:22888#TC-SH-LosA-BanH vless://0c5741d0-76a9-4945-9c1d-14647afcce24@89.208.251.209:443?encryption=none&flow=xtls-rprx-vision&security=tls&sni=octopus.107421.xyz&alpn=h2&fp=firefox&type=tcp&headerType=none#BanH-LosA-Vless trojan://Vad3.123acasd-1234-as.dAsd.asdazzS.123@89.208.251.209:443?flow=xtls-rprx-vision&security=tls&sni=xx.l4.cc.nn.107421.xyz&alpn=h2&fp=firefox&type=http&host=xx.l4.cc.nn.107421.xyz&path=status#BanH-LosA-Trojan -trojan://ADaSfsaad12.21312-.1Ac13.adsCCddasds.112321@140.238.14.103:443?flow=xtls-rprx-vision&security=tls&sni=xx.t2.ll.c0.107421.xyz&alpn=h2&fp=firefox&type=http&host=xx.t2.ll.c0.107421.xyz&path=vlh2tokyo2#Oracle-Tokyo-Trojan +vless://21dab95b-088e-47bd-8351-609fd23cb33c@140.238.14.103:20443?encryption=none&flow=xtls-rprx-vision&security=tls&sni=xx.t2.ll.c0.107421.xyz&alpn=h2&fp=firefox&type=tcp&headerType=none&host=xx.t2.ll.c0.107421.xyz#Oracle-Tokyo-By-Seoul-Vless +vless://4c2dd763-56e5-408f-bc8f-dbf4c1fe41f9@140.238.14.103:21443?encryption=none&flow=xtls-rprx-vision&security=tls&sni=xx.o1.vl.s4.107421.xyz&alpn=h2&fp=firefox&type=tcp&headerType=none&host=xx.o1.vl.s4.107421.xyz#Oracle-Osaka-By-Seoul-Vless +vless://de576486-e254-4d9d-949a-37088358ec23@140.238.14.103:22443?encryption=none&flow=xtls-rprx-vision&security=tls&sni=xx.p2.vl.s4.107421.xyz&alpn=h2&fp=firefox&type=tcp&headerType=none&host=xx.p2.vl.s4.107421.xyz#Oracle-Phoneix-By-Seoul-Vless vless://12491d80-745c-4e26-a58b-edf584afb208@129.146.57.94:443?encryption=none&flow=xtls-rprx-vision&security=tls&sni=zc.p4.cc.xx.107421.xyz&alpn=h2&fp=firefox&type=tcp&headerType=none#Oracle-Pheonix-ARM02-Vless diff --git a/1-代理Xray/XRay-安装脚本/Xray安装脚本.txt b/1-代理Xray/XRay-安装脚本/Xray安装脚本.txt index c41057d..d088553 100644 --- a/1-代理Xray/XRay-安装脚本/Xray安装脚本.txt +++ b/1-代理Xray/XRay-安装脚本/Xray安装脚本.txt @@ -6,4 +6,7 @@ systemctl daemon-reload systemctl restart xray systemctl enable xray + +bash -c "$(curl -L https://github.com/XTLS/Xray-install/raw/main/install-release.sh)" @ upgrade + journalctl -u xray -n 100 -f \ No newline at end of file diff --git a/2-NGINX相关/107421.xyz/21-申请证书.sh b/2-NGINX相关/107421.xyz/21-申请证书.sh index dbcbc88..a4a4ad8 100644 --- a/2-NGINX相关/107421.xyz/21-申请证书.sh +++ b/2-NGINX相关/107421.xyz/21-申请证书.sh @@ -7,6 +7,11 @@ export DOMAIN_NAME=xx.t2.ll.c0.107421.xyz export DOMAIN_NAME=zc.p4.cc.xx.107421.xyz export DOMAIN_NAME=bingo.107421.xyz +# osaka-1 +export DOMAIN_NAME=xx.o1.vl.s4.107421.xyz +# phoneix-2 +export DOMAIN_NAME=xx.p2.vl.s4.107421.xyz + export CF_Token="oXJRP5XI8Zhipa_PtYtB_jy6qWL0I9BosrJEYE8p" export CF_Account_ID="dfaadeb83406ef5ad35da02617af9191" @@ -17,4 +22,6 @@ 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 +--reloadcmd "systemctl restart nginx --force" + +acme.sh --renew -d xx.t2.ll.c0.107421.xyz --ecc \ No newline at end of file diff --git a/3-wdd初始化-OSS/init-script-wdd.sh b/3-wdd初始化-OSS/init-script-wdd.sh index 7728024..098d73e 100644 --- a/3-wdd初始化-OSS/init-script-wdd.sh +++ b/3-wdd初始化-OSS/init-script-wdd.sh @@ -884,7 +884,7 @@ modify_ssh_login() { ## 为了本脚本能够满足Ubuntu系统，做出设当的更改 common_tool_install() { FunctionStart "安装Linux常用工具" - + colorEchoGreen "当前系统的发行版为-- ${linux_release_version} ！！" colorEchoGreen "当前系统的发行版为-- ${linux_release_version} ！！" colorEchoGreen "当前系统的发行版为-- ${linux_release_version} ！！"