feat:调整peerbanhelper

apps/peerbanhelper/6.2.8-CN/.env.sample

@@ -1,3 +0,0 @@
-CONTAINER_NAME="peerbanhelper"
-PANEL_APP_PORT_HTTP="9898"
-DATA_PATH="./data"

apps/peerbanhelper/6.2.8-CN/data.yml

@@ -1,17 +0,0 @@
-additionalProperties:
-    formFields:
-        - default: 9898
-          edit: true
-          envKey: PANEL_APP_PORT_HTTP
-          labelEn: Port
-          labelZh: 端口
-          required: true
-          rule: paramPort
-          type: number
-        - default: ./data
-          edit: true
-          envKey: DATA_PATH
-          labelEn: Data folder path
-          labelZh: 数据文件夹路径
-          required: true
-          type: text

apps/peerbanhelper/6.2.8-CN/docker-compose.yml

@@ -1,16 +0,0 @@
-services:
-  peerbanhelper:
-    image: registry.cn-hangzhou.aliyuncs.com/ghostchu/peerbanhelper:v6.2.8
-    container_name: ${CONTAINER_NAME}
-    restart: always
-    networks:
-      - 1panel-network
-    ports:
-      - "${PANEL_APP_PORT_HTTP}:9898"
-    volumes:
-      - "${DATA_PATH}/peerbanhelper:/app/data"
-    labels:  
-      createdBy: "Apps"
-networks:  
-  1panel-network:  
-    external: true

apps/peerbanhelper/6.2.8/.env.sample

@@ -0,0 +1,7 @@
+CONTAINER_NAME="peerbanhelper"
+DATA_PATH="./data"
+PANEL_APP_PORT_HTTP=40294
+PGID=0
+PUID=0
+STOP_GRACE_PERIOD="30s"
+TIME_ZONE="Asia/Shanghai"

apps/peerbanhelper/6.2.8/data.yml

@@ -0,0 +1,45 @@
+additionalProperties:
+  formFields:
+    - default: "40294"
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelEn: Port
+      labelZh: 端口
+      required: true
+      rule: paramPort
+      type: number
+    - default: "./data"
+      edit: true
+      envKey: DATA_PATH
+      labelEn: Data folder path
+      labelZh: 数据文件夹路径
+      required: true
+      type: text
+    - default: "0"
+      edit: true
+      envKey: PUID
+      labelEn: User ID
+      labelZh: 用户 ID
+      required: true
+      type: number
+    - default: "0"
+      edit: true
+      envKey: PGID
+      labelEn: Group ID
+      labelZh: 组 ID
+      required: true
+      type: number
+    - default: "Asia/Shanghai"
+      edit: true
+      envKey: TIME_ZONE
+      labelEn: Time Zone
+      labelZh: 时区
+      required: true
+      type: text
+    - default: "30s"
+      edit: true
+      envKey: STOP_GRACE_PERIOD
+      labelEn: Stop Grace Period
+      labelZh: 停止宽限期
+      required: true
+      type: text

apps/peerbanhelper/6.2.8/docker-compose.yml

@@ -0,0 +1,21 @@
+services:
+  peerbanhelper:
+    image: "ghostchu/peerbanhelper:v6.2.8"
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - "${PANEL_APP_PORT_HTTP}:9898"
+    volumes:
+      - "${DATA_PATH}:/app/data"
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TIME_ZONE}
+    stop_grace_period: ${STOP_GRACE_PERIOD}
+    labels:
+      createdBy: "Apps"
+networks:
+  1panel-network:
+    external: true

apps/peerbanhelper/README.md

@@ -1,3 +1,16 @@
 # PeerBanHelper
 
-自动封禁不受欢迎、吸血和异常的 BT 客户端，并支持自定义规则。PeerId黑名单/UserAgent黑名单/IP CIDR/假进度/超量下载/进度回退/多播追猎/连锁封禁/伪装检测 支持 qBittorrent/Transmission/Deluge/BiglyBT/Vuze(Azureus)
+自动封禁不受欢迎、吸血和异常的 BT 客户端，并支持自定义规则。
+
+PeerId黑名单/UserAgent黑名单/IP CIDR/假进度/超量下载/进度回退/多播追猎/连锁封禁/伪装检测。
+
+支持 qBittorrent/Transmission/Deluge/BiglyBT/Vuze(Azureus)。
+
+## Docker 镜像地址
+
+可通过安装应用/修改应用参数时，在`高级设置`>`编辑 compose 文件`修改对应镜像。
+
+> 应用版本按需修改
+
+- DockerHub: `ghostchu/peerbanhelper:latest`
+- 阿里云国内镜像加速: `registry.cn-hangzhou.aliyuncs.com/ghostchu/peerbanhelper:latest`

apps/peerbanhelper/data.yml

@@ -1,19 +1,19 @@
 name: PeerBanHelper
 tags:
-  - 工具
+    - 实用工具
 title: BT 客户端反恶意吸血工具
-description: 自动封禁不受欢迎、吸血和异常的 BT 客户端，并支持自定义规则。PeerId黑名单/UserAgent黑名单/IP CIDR/假进度/超量下载/进度回退/多播追猎/连锁封禁/伪装检测 支持 qBittorrent/Transmission/Deluge/BiglyBT/Vuze(Azureus)
+description: BT 客户端反恶意吸血工具
 additionalProperties:
-  key: peerbanhelper
+    key: peerbanhelper
-  name: PeerBanHelper
+    name: PeerBanHelper
-  tags:  
+    tags:
-    - Tool
+        - Tool
-  shortDescZh: BT 客户端反恶意吸血工具
+    shortDescZh: BT 客户端反恶意吸血工具
-  shortDescEn: BitTorrent client anti malicious leech tool
+    shortDescEn: BitTorrent client anti malicious leech tool
-  type: tool
+    type: tool
-  crossVersionUpdate: true
+    crossVersionUpdate: true
-  limit: 0
+    limit: 0
-  recommend: 0
+    recommend: 0
-  website: https://github.com/PBH-BTN/PeerBanHelper
+    website: https://pbh-btn.github.io/pbh-docs
-  github: https://github.com/PBH-BTN/PeerBanHelper
+    github: https://github.com/PBH-BTN/PeerBanHelper
-  document: https://pbh-btn.github.io/pbh-docs/
+    document: https://pbh-btn.github.io/pbh-docs

apps/peerbanhelper/latest-CN/.env.sample

@@ -0,0 +1,7 @@
+CONTAINER_NAME="peerbanhelper"
+DATA_PATH="./data"
+PANEL_APP_PORT_HTTP=40294
+PGID=0
+PUID=0
+STOP_GRACE_PERIOD="30s"
+TIME_ZONE="Asia/Shanghai"

apps/peerbanhelper/latest-CN/data.yml

@@ -0,0 +1,45 @@
+additionalProperties:
+  formFields:
+    - default: "40294"
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelEn: Port
+      labelZh: 端口
+      required: true
+      rule: paramPort
+      type: number
+    - default: "./data"
+      edit: true
+      envKey: DATA_PATH
+      labelEn: Data folder path
+      labelZh: 数据文件夹路径
+      required: true
+      type: text
+    - default: "0"
+      edit: true
+      envKey: PUID
+      labelEn: User ID
+      labelZh: 用户 ID
+      required: true
+      type: number
+    - default: "0"
+      edit: true
+      envKey: PGID
+      labelEn: Group ID
+      labelZh: 组 ID
+      required: true
+      type: number
+    - default: "Asia/Shanghai"
+      edit: true
+      envKey: TIME_ZONE
+      labelEn: Time Zone
+      labelZh: 时区
+      required: true
+      type: text
+    - default: "30s"
+      edit: true
+      envKey: STOP_GRACE_PERIOD
+      labelEn: Stop Grace Period
+      labelZh: 停止宽限期
+      required: true
+      type: text

apps/peerbanhelper/latest-CN/docker-compose.yml

@@ -0,0 +1,21 @@
+services:
+  peerbanhelper:
+    image: "registry.cn-hangzhou.aliyuncs.com/ghostchu/peerbanhelper:latest"
+    container_name: ${CONTAINER_NAME}
+    restart: always
+    networks:
+      - 1panel-network
+    ports:
+      - "${PANEL_APP_PORT_HTTP}:9898"
+    volumes:
+      - "${DATA_PATH}:/app/data"
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TIME_ZONE}
+    stop_grace_period: ${STOP_GRACE_PERIOD}
+    labels:
+      createdBy: "Apps"
+networks:
+  1panel-network:
+    external: true

apps/peerbanhelper/latest/.env.sample

@@ -1,3 +1,7 @@
 CONTAINER_NAME="peerbanhelper"
-PANEL_APP_PORT_HTTP="9898"
 DATA_PATH="./data"
+PANEL_APP_PORT_HTTP=40294
+PGID=0
+PUID=0
+STOP_GRACE_PERIOD="30s"
+TIME_ZONE="Asia/Shanghai"

apps/peerbanhelper/latest/data.yml

@@ -1,17 +1,45 @@
 additionalProperties:
-    formFields:
+  formFields:
-        - default: 9898
+    - default: "40294"
-          edit: true
+      edit: true
-          envKey: PANEL_APP_PORT_HTTP
+      envKey: PANEL_APP_PORT_HTTP
-          labelEn: Port
+      labelEn: Port
-          labelZh: 端口
+      labelZh: 端口
-          required: true
+      required: true
-          rule: paramPort
+      rule: paramPort
-          type: number
+      type: number
-        - default: ./data
+    - default: "./data"
-          edit: true
+      edit: true
-          envKey: DATA_PATH
+      envKey: DATA_PATH
-          labelEn: Data folder path
+      labelEn: Data folder path
-          labelZh: 数据文件夹路径
+      labelZh: 数据文件夹路径
-          required: true
+      required: true
-          type: text
+      type: text
+    - default: "0"
+      edit: true
+      envKey: PUID
+      labelEn: User ID
+      labelZh: 用户 ID
+      required: true
+      type: number
+    - default: "0"
+      edit: true
+      envKey: PGID
+      labelEn: Group ID
+      labelZh: 组 ID
+      required: true
+      type: number
+    - default: "Asia/Shanghai"
+      edit: true
+      envKey: TIME_ZONE
+      labelEn: Time Zone
+      labelZh: 时区
+      required: true
+      type: text
+    - default: "30s"
+      edit: true
+      envKey: STOP_GRACE_PERIOD
+      labelEn: Stop Grace Period
+      labelZh: 停止宽限期
+      required: true
+      type: text

apps/peerbanhelper/latest/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   peerbanhelper:
-    image: ghostchu/peerbanhelper:latest
+    image: "ghostchu/peerbanhelper:latest"
     container_name: ${CONTAINER_NAME}
     restart: always
     networks:
@@ -8,7 +8,12 @@ services:
     ports:
       - "${PANEL_APP_PORT_HTTP}:9898"
     volumes:
-      - "${DATA_PATH}/peerbanhelper:/app/data"
+      - "${DATA_PATH}:/app/data"
+    environment:
+      - PUID=${PUID}
+      - PGID=${PGID}
+      - TZ=${TIME_ZONE}
+    stop_grace_period: ${STOP_GRACE_PERIOD}
     labels:
       createdBy: "Apps"
 networks: