Merge remote-tracking branch 'refs/remotes/origin/codex/simplex-smp-server-7.0.1-repair-20261019' into codex/lease-publish-pr7769-20261019

2026-10-30 16:05:49 +00:00 · 2026-10-19 02:35:38 +08:00
parent 28130cf73b d12f947d38
commit ebddadd4d3
10 changed files with 132 additions and 2 deletions
@@ -3,4 +3,4 @@ APP_CONFIG_DIR=./data/config
 APP_STATE_DIR=./data/state
 ADDR=
 PASS=
-CONTAINER_NAME=
+CONTAINER_NAME=simplex-smp-server
@@ -5,6 +5,7 @@ services:
    environment:
      - ADDR=${ADDR}
      - PASS=${PASS}
+      - WEB_MANUAL=1
    ports:
      - "${PANEL_APP_PORT_SMP}:5223"
    volumes:
@@ -0,0 +1,6 @@
+PANEL_APP_PORT_SMP=5223
+APP_CONFIG_DIR=./data/config
+APP_STATE_DIR=./data/state
+ADDR=
+PASS=
+CONTAINER_NAME=simplex-smp-server
@@ -0,0 +1,83 @@
+additionalProperties:
+  formFields:
+    - default: 5223
+      edit: true
+      envKey: PANEL_APP_PORT_SMP
+      labelEn: SMP Port
+      labelZh: SMP 端口
+      label:
+        en: SMP Port
+        zh: SMP 端口
+        zh-Hant: SMP 埠
+        ja: SMP ポート
+        ko: SMP 포트
+        ru: SMP-порт
+        ms: Port SMP
+        pt-br: Porta SMP
+      required: true
+      rule: paramPort
+      type: number
+    - default: ./data/config
+      edit: true
+      envKey: APP_CONFIG_DIR
+      labelEn: Config Directory
+      labelZh: 配置目录
+      label:
+        en: Config Directory
+        zh: 配置目录
+        zh-Hant: 設定目錄
+        ja: 設定ディレクトリ
+        ko: 설정 디렉터리
+        ru: Каталог конфигурации
+        ms: Direktori Konfigurasi
+        pt-br: Diretório de Configuração
+      required: true
+      type: text
+    - default: ./data/state
+      edit: true
+      envKey: APP_STATE_DIR
+      labelEn: State Directory
+      labelZh: 状态目录
+      label:
+        en: State Directory
+        zh: 状态目录
+        zh-Hant: 狀態目錄
+        ja: 状態ディレクトリ
+        ko: 상태 디렉터리
+        ru: Каталог состояния
+        ms: Direktori Keadaan
+        pt-br: Diretório de Estado
+      required: true
+      type: text
+    - default: ''
+      edit: true
+      envKey: ADDR
+      labelEn: Server Domain or IP
+      labelZh: 服务器域名或 IP
+      label:
+        en: Server Domain or IP
+        zh: 服务器域名或 IP
+        zh-Hant: 伺服器網域或 IP
+        ja: サーバードメインまたは IP
+        ko: 서버 도메인 또는 IP
+        ru: Домен или IP сервера
+        ms: Domain atau IP Pelayan
+        pt-br: Dominio ou IP do Servidor
+      required: true
+      type: text
+    - default: ''
+      edit: true
+      envKey: PASS
+      labelEn: Create Queue Password
+      labelZh: 队列创建密码
+      label:
+        en: Create Queue Password
+        zh: 队列创建密码
+        zh-Hant: 佇列建立密碼
+        ja: キュー作成パスワード
+        ko: 큐 생성 비밀번호
+        ru: Пароль создания очередей
+        ms: Kata Laluan Penciptaan Barisan
+        pt-br: Senha para Criacao de Filas
+      required: false
+      type: text
@@ -0,0 +1,27 @@
+services:
+  simplex-smp-server:
+    image: "simplexchat/smp-server:v7.0.1"
+    container_name: ${CONTAINER_NAME}
+    environment:
+      - ADDR=${ADDR}
+      - PASS=${PASS}
+      - WEB_MANUAL=1
+    ports:
+      - "${PANEL_APP_PORT_SMP}:5223"
+    volumes:
+      - "${APP_CONFIG_DIR}:/etc/opt/simplex"
+      - "${APP_STATE_DIR}:/var/opt/simplex"
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - >-
+          bash -lc 'exec 3<>/dev/tcp/127.0.0.1/5223; exec 3>&-; exec 3<&-'
+    labels:
+      createdBy: Apps
+    networks:
+      - 1panel-network
+    restart: unless-stopped
+
+networks:
+  1panel-network:
+    external: true
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -euo pipefail
+
+docker-compose down --volumes
@@ -11,3 +11,4 @@ fi
 CONFIG_DIR="${APP_CONFIG_DIR:-./data/config}"
 STATE_DIR="${APP_STATE_DIR:-./data/state}"
 mkdir -p "$CONFIG_DIR" "$STATE_DIR"
+rm -f "$STATE_DIR"/smp-server-stats.log "$STATE_DIR"/smp-server-stats.daily.log
@@ -17,6 +17,9 @@ smp://指纹[:创建队列密码]@ADDR:PANEL_APP_PORT_SMP

 `ADDR` 默认值为 `127.0.0.1`，仅适用于本地初始化与测试。正式安装时请直接填写你的公网域名或公网 IP，SimpleX 客户端通过该地址与 SMP 端口连接。

+## 运行模式
+此包使用 SimpleX 官方 Docker manual 模式，SMP 主要监听端口为 5223。本包不启动 Caddy/Let's Encrypt，也不提供 443 的服务器信息页。首次启动仍会初始化 SMP 指纹和 `smp-server.ini`。
+
 ## 数据持久化
 - `APP_CONFIG_DIR`：持久化 `/etc/opt/simplex`，保存证书、指纹与 `smp-server.ini`
 - `APP_STATE_DIR`：持久化 `/var/opt/simplex`，保存 store log、统计与运行状态文件
@@ -34,8 +37,13 @@ SimpleX SMP Server is the official self-hosted relay server for SimpleX. This ad
 - Optional password for creating new queues
 - `ADDR` must be set to your public domain or public IP during installation

+## Runtime mode
+This package uses SimpleX's official Docker manual setup, with SMP on TCP 5223. It does not include Caddy/Let's Encrypt or the automatically managed HTTPS server information page on port 443. First startup still initializes the SMP fingerprint and `smp-server.ini`.
+
 ## 版本说明
-固定版本使用官方镜像 `simplexchat/smp-server:v7.0.0`，`latest` 当前同样基于 7.0.0 发布线。
+固定版本目录更新至官方镜像 `simplexchat/smp-server:v7.0.1`；`latest` 继续跟随官方滚动标签，可能独立变化。
+
+The fixed version directory uses the official `simplexchat/smp-server:v7.0.1` image. The `latest` directory follows the upstream rolling tag and may move independently.

 ## 参考资料
 - 官网: <https://simplex.chat/>