diff --git a/apps/peerbanhelper/6.2.8-CN/.env.sample b/apps/peerbanhelper/6.2.8-CN/.env.sample deleted file mode 100644 index d9ac8fe0..00000000 --- a/apps/peerbanhelper/6.2.8-CN/.env.sample +++ /dev/null @@ -1,3 +0,0 @@ -CONTAINER_NAME="peerbanhelper" -PANEL_APP_PORT_HTTP="9898" -DATA_PATH="./data" \ No newline at end of file diff --git a/apps/peerbanhelper/6.2.8-CN/data.yml b/apps/peerbanhelper/6.2.8-CN/data.yml deleted file mode 100644 index 93cb7ce6..00000000 --- a/apps/peerbanhelper/6.2.8-CN/data.yml +++ /dev/null @@ -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 diff --git a/apps/peerbanhelper/6.2.8-CN/docker-compose.yml b/apps/peerbanhelper/6.2.8-CN/docker-compose.yml deleted file mode 100644 index dd0bbe71..00000000 --- a/apps/peerbanhelper/6.2.8-CN/docker-compose.yml +++ /dev/null @@ -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 diff --git a/apps/peerbanhelper/6.2.8/.env.sample b/apps/peerbanhelper/6.2.8/.env.sample new file mode 100644 index 00000000..531868f7 --- /dev/null +++ b/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" diff --git a/apps/peerbanhelper/6.2.8/data.yml b/apps/peerbanhelper/6.2.8/data.yml new file mode 100644 index 00000000..09e26c1f --- /dev/null +++ b/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 diff --git a/apps/peerbanhelper/6.2.8/docker-compose.yml b/apps/peerbanhelper/6.2.8/docker-compose.yml new file mode 100644 index 00000000..47a76905 --- /dev/null +++ b/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 diff --git a/apps/peerbanhelper/README.md b/apps/peerbanhelper/README.md index 13e1ccf3..d261ec7c 100644 --- a/apps/peerbanhelper/README.md +++ b/apps/peerbanhelper/README.md @@ -1,3 +1,16 @@ # PeerBanHelper -自动封禁不受欢迎、吸血和异常的 BT 客户端,并支持自定义规则。PeerId黑名单/UserAgent黑名单/IP CIDR/假进度/超量下载/进度回退/多播追猎/连锁封禁/伪装检测 支持 qBittorrent/Transmission/Deluge/BiglyBT/Vuze(Azureus) \ No newline at end of file +自动封禁不受欢迎、吸血和异常的 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` \ No newline at end of file diff --git a/apps/peerbanhelper/data.yml b/apps/peerbanhelper/data.yml index 9978846b..e3a67f59 100644 --- a/apps/peerbanhelper/data.yml +++ b/apps/peerbanhelper/data.yml @@ -1,19 +1,19 @@ name: PeerBanHelper -tags: - - 工具 +tags: + - 实用工具 title: BT 客户端反恶意吸血工具 -description: 自动封禁不受欢迎、吸血和异常的 BT 客户端,并支持自定义规则。PeerId黑名单/UserAgent黑名单/IP CIDR/假进度/超量下载/进度回退/多播追猎/连锁封禁/伪装检测 支持 qBittorrent/Transmission/Deluge/BiglyBT/Vuze(Azureus) +description: BT 客户端反恶意吸血工具 additionalProperties: - key: peerbanhelper - name: PeerBanHelper - tags: - - Tool - shortDescZh: BT 客户端反恶意吸血工具 - shortDescEn: BitTorrent client anti malicious leech tool - type: tool - crossVersionUpdate: true - limit: 0 - recommend: 0 - website: https://github.com/PBH-BTN/PeerBanHelper - github: https://github.com/PBH-BTN/PeerBanHelper - document: https://pbh-btn.github.io/pbh-docs/ \ No newline at end of file + key: peerbanhelper + name: PeerBanHelper + tags: + - Tool + shortDescZh: BT 客户端反恶意吸血工具 + shortDescEn: BitTorrent client anti malicious leech tool + type: tool + crossVersionUpdate: true + limit: 0 + recommend: 0 + website: https://pbh-btn.github.io/pbh-docs + github: https://github.com/PBH-BTN/PeerBanHelper + document: https://pbh-btn.github.io/pbh-docs diff --git a/apps/peerbanhelper/latest-CN/.env.sample b/apps/peerbanhelper/latest-CN/.env.sample new file mode 100644 index 00000000..531868f7 --- /dev/null +++ b/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" diff --git a/apps/peerbanhelper/latest-CN/data.yml b/apps/peerbanhelper/latest-CN/data.yml new file mode 100644 index 00000000..09e26c1f --- /dev/null +++ b/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 diff --git a/apps/peerbanhelper/latest-CN/docker-compose.yml b/apps/peerbanhelper/latest-CN/docker-compose.yml new file mode 100644 index 00000000..5a4025e0 --- /dev/null +++ b/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 diff --git a/apps/peerbanhelper/latest/.env.sample b/apps/peerbanhelper/latest/.env.sample index d9ac8fe0..531868f7 100644 --- a/apps/peerbanhelper/latest/.env.sample +++ b/apps/peerbanhelper/latest/.env.sample @@ -1,3 +1,7 @@ CONTAINER_NAME="peerbanhelper" -PANEL_APP_PORT_HTTP="9898" -DATA_PATH="./data" \ No newline at end of file +DATA_PATH="./data" +PANEL_APP_PORT_HTTP=40294 +PGID=0 +PUID=0 +STOP_GRACE_PERIOD="30s" +TIME_ZONE="Asia/Shanghai" diff --git a/apps/peerbanhelper/latest/data.yml b/apps/peerbanhelper/latest/data.yml index 93cb7ce6..09e26c1f 100644 --- a/apps/peerbanhelper/latest/data.yml +++ b/apps/peerbanhelper/latest/data.yml @@ -1,17 +1,45 @@ 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 + 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 diff --git a/apps/peerbanhelper/latest/docker-compose.yml b/apps/peerbanhelper/latest/docker-compose.yml index f793051c..20e9c637 100644 --- a/apps/peerbanhelper/latest/docker-compose.yml +++ b/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,9 +8,14 @@ services: ports: - "${PANEL_APP_PORT_HTTP}:9898" volumes: - - "${DATA_PATH}/peerbanhelper:/app/data" - labels: + - "${DATA_PATH}:/app/data" + environment: + - PUID=${PUID} + - PGID=${PGID} + - TZ=${TIME_ZONE} + stop_grace_period: ${STOP_GRACE_PERIOD} + labels: createdBy: "Apps" -networks: - 1panel-network: +networks: + 1panel-network: external: true diff --git a/apps/peerbanhelper/logo.png b/apps/peerbanhelper/logo.png index ba23d803..09254a18 100644 Binary files a/apps/peerbanhelper/logo.png and b/apps/peerbanhelper/logo.png differ