From 97cadb9b7a0d4a8324e97a575a7112aa1111be7c Mon Sep 17 00:00:00 2001
From: zeaslity <ice@qq.com>
Date: Fri, 26 Apr 2024 16:25:40 +0800
Subject: [PATCH] =?UTF-8?q?[=20xray=20]=20=E4=BC=98=E5=8C=96clash=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E7=9A=84dns=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Public/init-script-wdd.sh                     |  8 ++---
 v2ray示例/98-subscribe-clash.yaml             |  7 +++-
 v2ray示例/99-subscribe-octopus-latest.txt     |  4 ++-
 .../搬瓦工-洛杉矶-实际使用的Xray配置.json     | 28 +++++++++++++++
 .../firewalld防火墙规则/搬瓦工防火墙.txt      |  5 +--
 .../gitea-bitnami-docker-compose.yaml         |  6 ++++
 .../自用3570/gitea-docker-compose-35.70.yaml  | 34 +++++++++++++++++++
 7 files changed, 84 insertions(+), 8 deletions(-)
 create mode 100644 部署应用/Oracle-Cloud/自建代码仓库-gitea/自用3570/gitea-docker-compose-35.70.yaml

diff --git a/Public/init-script-wdd.sh b/Public/init-script-wdd.sh
index 217d02e..1e60bab 100644
--- a/Public/init-script-wdd.sh
+++ b/Public/init-script-wdd.sh
@@ -455,7 +455,7 @@ install_zsh() {
   install_demand_softwares zsh git || return $?
   # 脚本会自动更换默认的shell
   if [[ $deploy_in_cn -eq 1 ]]; then
-      echo y | REMOTE=https://gitee.com/mirrors/oh-my-zsh.git sh -c "$(curl -fsSL https://gitee.com/mirrors/oh-my-zsh/raw/master/tools/install.sh)"
+      echo y | REMOTE=https://gitea.107421.xyz/zeaslity/oh-my-zsh.git sh -c "$(curl -fsSL https://gitea.107421.xyz/zeaslity/ohmyzsh/raw/branch/master/tools/install.sh)"
   else
       echo y | sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
   fi
@@ -491,9 +491,9 @@ modify_zsh() {
   SplitLine
 
   cat >~/oh-my-zsh-plugins-list.txt <<EOF
-https://cdn.jsdelivr.net/gh/ohmyzsh/ohmyzsh/plugins/command-not-found/command-not-found.plugin.zsh
-https://cdn.jsdelivr.net/gh/ohmyzsh/ohmyzsh/plugins/autojump/autojump.plugin.zsh
-https://cdn.jsdelivr.net/gh/ohmyzsh/ohmyzsh/plugins/themes/themes.plugin.zsh
+https://gitea.107421.xyz/zeaslity/ohmyzsh/src/branch/master/plugins/command-not-found/command-not-found.plugin.zsh
+https://gitea.107421.xyz/zeaslity/ohmyzsh/src/branch/master/plugins/autojump/autojump.plugin.zsh
+https://gitea.107421.xyz/zeaslity/ohmyzsh/src/branch/master/plugins/themes/themes.plugin.zsh
 EOF
   log "正在下载zsh的一些好用的插件："
   echo ""
diff --git a/v2ray示例/98-subscribe-clash.yaml b/v2ray示例/98-subscribe-clash.yaml
index 97ed806..9979d70 100644
--- a/v2ray示例/98-subscribe-clash.yaml
+++ b/v2ray示例/98-subscribe-clash.yaml
@@ -53,7 +53,8 @@ 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":"trojan","name":"LosAngels-BanH-Trojan","server":"89.208.251.209","port":443,"password":"V2ryStr0ngP0ss","udp":true,"skip-cert-verify":false,"sni":"xx.l4.cc.nn.107421.xyz","network":"tcp","ws-opts":{"headers":{"host":"xx.l4.cc.nn.107421.xyzh2,http/1.1"}}}
+
+  - {"type":"trojan","name":"LosAngels-BanH-Trojan","server":"89.208.251.209","port":29999,"password":"v2ryStr@ngPa.ss","udp":true,"skip-cert-verify":false,"sni":"xx.l4.cc.nn.107421.xyz","network":"tcp","ws-opts":{"headers":{"host":"xx.l4.cc.nn.107421.xyzh2,http/1.1"}}}
   - {"type":"trojan","name":"Seoul-Trojan","server":"140.238.14.103","port":443,"password":"V2ryStr0ngP0ss","udp":true,"skip-cert-verify":false,"sni":"xx.s4.cc.hh.107421.xyz","network":"tcp","ws-opts":{"headers":{"host":"xx.s4.cc.hh.107421.xyzh2,http/1.1"}}}
   - {"type":"trojan","name":"Osaka-Trojan","server":"140.238.14.103","port":19997,"password":"V2ryStr0ngP0ss","udp":true,"skip-cert-verify":false,"sni":"xx.s4.cc.hh.107421.xyz","network":"tcp","ws-opts":{"headers":{"host":"xx.s4.cc.hh.107421.xyzh2,http/1.1"}}}
   - {"type":"trojan","name":"Tokyo-Trojan","server":"140.238.14.103","port":19999,"password":"V2ryStr0ngP0ss","udp":true,"skip-cert-verify":false,"sni":"xx.s4.cc.hh.107421.xyz","network":"tcp","ws-opts":{"headers":{"host":"xx.s4.cc.hh.107421.xyzh2,http/1.1"}}}
@@ -62,6 +63,7 @@ proxies:
   - {"type":"trojan","name":"HongK-Tencent-Trojan","server":"43.154.83.213","port":443,"password":"V2ryStr0ngP0ss","udp":true,"skip-cert-verify":false,"sni":"xx.tc.hk.go.107421.xyz","network":"tcp"}
   - {"type":"vless","name":"Tencent-HK-11.24","server":"43.154.83.213","port":29999,"uuid":"fc903f5d-a007-482b-928c-570da9a851f9","skip-cert-verify":false,"network":"tcp","flow":"xtls-rprx-vision","servername":"xx.tc.hk.go.107421.xyz","tls":true,"udp":true}
   - {"type":"socks5","name":"onetools-35-71","server":"192.168.35.71","port":22888,"username":"zeaslity","password":"password","udp":true}
+  - {"type":"trojan","name":"LosAngels-BanH-Trojan-Back","server":"89.208.251.209","port":443,"password":"V2ryStr0ngP0ss","udp":true,"skip-cert-verify":false,"sni":"xx.l4.cc.nn.107421.xyz","network":"tcp","ws-opts":{"headers":{"host":"xx.l4.cc.nn.107421.xyzh2,http/1.1"}}}
   - {"type":"socks5","name":"Seoul-F-Shanghai-TC","server":"42.192.52.227","port":22888,"username":"zeaslity","password":"lovemm.23","udp":true}
 proxy-groups:
   - name: 🚀 节点选择
@@ -80,6 +82,7 @@ proxy-groups:
       - Tencent-HK-11.24
       - onetools-35-71
       - Seoul-F-Shanghai-TC
+      - LosAngels-BanH-Trojan-Back
   - name: ♻️ 自动选择
     type: url-test
     url: http://www.gstatic.com/generate_204
@@ -94,6 +97,7 @@ proxy-groups:
       - Tokyo-Trojan
       - Phoenix-Trojan
       - Seoul-arm64-01-Trojan
+      - LosAngels-BanH-Trojan-Back
       - Tencent-HK-11.24
       - Seoul-F-Shanghai-TC
   - name: 🌍 国外媒体
@@ -109,6 +113,7 @@ proxy-groups:
       - Tokyo-Trojan
       - Phoenix-Trojan
       - Seoul-arm64-01-Trojan
+      - LosAngels-BanH-Trojan-Back
       - HongK-Tencent-Trojan
       - Tencent-HK-11.24
   - name: 📲 电报信息
diff --git a/v2ray示例/99-subscribe-octopus-latest.txt b/v2ray示例/99-subscribe-octopus-latest.txt
index 8d05dd7..e76683b 100644
--- a/v2ray示例/99-subscribe-octopus-latest.txt
+++ b/v2ray示例/99-subscribe-octopus-latest.txt
@@ -1,8 +1,10 @@
 vmess://eyJ2IjoiMiIsInBzIjoidXMtY2VudGUtZnJlZSIsImFkZCI6Im5vcnRoZmxhbmsuMTA3NDIxLnh5eiIsInBvcnQiOjQ0MywiaWQiOiJkZTA0YWRkOS01YzY4LThiYWItOTUwYy0wOGNkNTMyMGRmMTgiLCJhaWQiOjAsInNjeSI6ImF1dG8iLCJuZXQiOiJ3cyIsInBhdGgiOiIvdm1lc3MiLCJ0bHMiOiJ0bHMifQ==
 trojan://V2ryStr0ngP0ss@140.238.14.103:443?type=tcp&sni=xx.s4.cc.hh.107421.xyz&allowInsecure=0&host=xx.s4.cc.hh.107421.xyzh2,http/1.1#Seoul-Trojan
+trojan://V2ryStr0ngP0ss@89.208.251.209:29999?security=tls&sni=xx.l4.cc.nn.107421.xyz&alpn=h2%2Chttp%2F1.1&fp=safari&type=tcp&headerType=none#LosAngels-BanH-Trojan
 trojan://V2ryStr0ngP0ss@140.238.14.103:19997?type=tcp&sni=xx.s4.cc.hh.107421.xyz&allowInsecure=0&host=xx.s4.cc.hh.107421.xyzh2,http/1.1#Osaka-Trojan
 trojan://V2ryStr0ngP0ss@140.238.14.103:19999?type=tcp&sni=xx.s4.cc.hh.107421.xyz&allowInsecure=0&host=xx.s4.cc.hh.107421.xyzh2,http/1.1#Tokyo-Trojan
 trojan://V2ryStr0ngP0ss@140.238.14.103:19998?type=tcp&sni=xx.s4.cc.hh.107421.xyz&allowInsecure=0&host=xx.s4.cc.hh.107421.xyzh2,http/1.1#Pheonix-Trojan
 trojan://V2ryStr0ngP0ss@146.56.147.12:30000?type=tcp&sni=xx.s0.yy.ac.107421.xyz&allowInsecure=0&host=xx.s0.yy.ac.107421.xyzh2,http/1.1#Seoul-arm64-01-Trojan
 trojan://V2ryStr0ngP0ss@43.154.83.213:443?type=tcp&sni=xx.tc.hk.go.107421.xyz&allowInsecure=0h2,http/1.1#Tencent-Hkong-Trojan
-vless://fc903f5d-a007-482b-928c-570da9a851f9@43.154.83.213:29999?security=reality&flow=xtls-rprx-vision&type=tcp&sni=xx.tc.hk.go.107421.xyz&fp=chrome&pbk=IBKk7cbbpnarU9sxJx84tXztytBFH2oCNfy7FlLVjDg&sid=ad570cbfab&encryption=none&headerType=none#Tencent-HK-11.24
\ No newline at end of file
+vless://fc903f5d-a007-482b-928c-570da9a851f9@43.154.83.213:29999?security=reality&flow=xtls-rprx-vision&type=tcp&sni=xx.tc.hk.go.107421.xyz&fp=chrome&pbk=IBKk7cbbpnarU9sxJx84tXztytBFH2oCNfy7FlLVjDg&sid=ad570cbfab&encryption=none&headerType=none#Tencent-HK-11.24
+trojan://V2ryStr0ngP0ss@89.208.251.209:443?security=tls&sni=xx.l4.cc.nn.107421.xyz&alpn=h2%2Chttp%2F1.1&fp=safari&type=tcp&headerType=none#LosAngels-BanH-Trojan-Back
diff --git a/v2ray示例/Xray-终级方案/搬瓦工-洛杉矶-实际使用的Xray配置.json b/v2ray示例/Xray-终级方案/搬瓦工-洛杉矶-实际使用的Xray配置.json
index 4ff5f3b..21f5932 100644
--- a/v2ray示例/Xray-终级方案/搬瓦工-洛杉矶-实际使用的Xray配置.json
+++ b/v2ray示例/Xray-终级方案/搬瓦工-洛杉矶-实际使用的Xray配置.json
@@ -29,6 +29,34 @@
         }
       },
       "tag": "LosAngels-amd64-01"
+    },
+    {
+      "protocol": "trojan",
+      "listen": "0.0.0.0",
+      "port": 29999,
+      "settings": {
+        "clients": [
+          {
+            "password": "v2ryStr@ngPa.ss"
+          }
+        ]
+      },
+      "streamSettings": {
+        "network": "tcp",
+        "security": "tls",
+        "tlsSettings": {
+          "alpn": [
+            "h2",
+            "http/1.1"
+          ],
+          "certificates": [
+            {
+              "certificateFile": "/root/.acme.sh/xx.l4.cc.nn.107421.xyz_ecc/fullchain.cer",
+              "keyFile": "/root/.acme.sh/xx.l4.cc.nn.107421.xyz_ecc/xx.l4.cc.nn.107421.xyz.key"
+            }
+          ]
+        }
+      }
     }
   ],
   "outbounds": [
diff --git a/v2ray示例/firewalld防火墙规则/搬瓦工防火墙.txt b/v2ray示例/firewalld防火墙规则/搬瓦工防火墙.txt
index caea25c..e81c605 100644
--- a/v2ray示例/firewalld防火墙规则/搬瓦工防火墙.txt
+++ b/v2ray示例/firewalld防火墙规则/搬瓦工防火墙.txt
@@ -11,9 +11,10 @@ firewall-cmd --permanent --add-port=80/tcp
 firewall-cmd --permanent --add-port=80/udp
 
 # 允许来自20000-30000的tcp udp端口
-sudo firewall-cmd --permanent --add-rich-rule='rule family="ipv4" source-port port-range="20000-30000" protocol="tcp" accept'
-sudo firewall-cmd --permanent --add-rich-rule='rule family="ipv4" source-port port-range="20000-30000" protocol="udp" accept'
 
+sudo firewall-cmd --zone=drop --add-port=20000-30000/tcp --permanent
+sudo firewall-cmd --zone=drop --add-port=20000-30000/udp --permanent
+sudo firewall-cmd --reload
 
 # 重新载入防火墙规则
 firewall-cmd --reload
diff --git a/部署应用/Oracle-Cloud/自建代码仓库-gitea/gitea-bitnami-docker-compose.yaml b/部署应用/Oracle-Cloud/自建代码仓库-gitea/gitea-bitnami-docker-compose.yaml
index df50971..54e9f92 100644
--- a/部署应用/Oracle-Cloud/自建代码仓库-gitea/gitea-bitnami-docker-compose.yaml
+++ b/部署应用/Oracle-Cloud/自建代码仓库-gitea/gitea-bitnami-docker-compose.yaml
@@ -1,3 +1,5 @@
+# https://hub.docker.com/r/bitnami/gitea
+
 version: '2'
 services:
   postgresql:
@@ -23,6 +25,10 @@ services:
       - GITEA_ADMIN_EMAIL=wdd@107421.xyz
       - GITEA_HTTP_PORT=3000
       - GITEA_SSH_LISTEN_PORT=22222
+      - GITEA_APP_NAME=Gitea-闲下来就喝杯茶吧
+      - GITEA_DOMAIN=192.168.35.70
+      - GITEA_PROTOCOL=http
+      - GITEA_RUN_MODE=prod
     ports:
       - '3000:3000'
       - '22222:22222'
diff --git a/部署应用/Oracle-Cloud/自建代码仓库-gitea/自用3570/gitea-docker-compose-35.70.yaml b/部署应用/Oracle-Cloud/自建代码仓库-gitea/自用3570/gitea-docker-compose-35.70.yaml
new file mode 100644
index 0000000..3b3c511
--- /dev/null
+++ b/部署应用/Oracle-Cloud/自建代码仓库-gitea/自用3570/gitea-docker-compose-35.70.yaml
@@ -0,0 +1,34 @@
+# https://hub.docker.com/r/bitnami/gitea
+
+version: '2'
+services:
+  postgresql:
+    image: docker.io/bitnami/postgresql:15
+    volumes:
+      - '/data/gitea/postgresql_data/:/bitnami/postgresql'
+    environment:
+      - POSTGRESQL_DATABASE=gitea_db
+      - POSTGRESQL_USERNAME=bn_gitea
+      - POSTGRESQL_PASSWORD=SuperWdd.123
+      # ALLOW_EMPTY_PASSWORD is recommended only for development.
+  gitea:
+    image: docker.io/bitnami/gitea:1.19.3-debian-11-r0
+    volumes:
+      - '/data/gitea/gitea_data:/bitnami/gitea'
+    environment:
+      - GITEA_DATABASE_HOST=postgresql
+      - GITEA_DATABASE_NAME=gitea_db
+      - GITEA_DATABASE_USERNAME=bn_gitea
+      - GITEA_DATABASE_PASSWORD=SuperWdd.123
+      - GITEA_ADMIN_USER=wdd
+      - GITEA_ADMIN_PASSWORD=SuperWdd.123
+      - GITEA_ADMIN_EMAIL=wdd@cmii.com
+      - GITEA_HTTP_PORT=3000
+      - GITEA_SSH_LISTEN_PORT=22222
+      - GITEA_APP_NAME=Gitea-闲下来就喝杯茶吧
+      - GITEA_DOMAIN=192.168.35.70
+      - GITEA_PROTOCOL=http
+      - GITEA_RUN_MODE=prod
+    ports:
+      - '3000:3000'
+      - '22222:22222'