From 57fa0d0b5725cc017246aabd4d07518fab806afc Mon Sep 17 00:00:00 2001
From: LanQin <lanqinnet@qq.com>
Date: Tue, 16 Jun 2026 21:53:02 +0800
Subject: [PATCH] =?UTF-8?q?chore(deploy):=20=E5=85=BC=E5=AE=B9=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E7=8E=AF=E5=A2=83=E4=B8=8B=E7=9A=84=20rspamd=20?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 `supervisord.conf` 中改为按用户存在情况动态选择 `rspamd` 启动参数。
- 当 `_rspamd` 和 `rspamd` 用户都不存在时，回退为 `--insecure` 启动。
---
 deploy/all-in-one/supervisord.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/all-in-one/supervisord.conf b/deploy/all-in-one/supervisord.conf
index 153aa7c..13290ef 100644
--- a/deploy/all-in-one/supervisord.conf
+++ b/deploy/all-in-one/supervisord.conf
@@ -35,7 +35,7 @@ stderr_logfile_maxbytes=0
 priority=30
 
 [program:rspamd]
-command=/usr/bin/rspamd -f -u _rspamd -g _rspamd
+command=/bin/sh -c 'if id _rspamd >/dev/null 2>&1; then exec /usr/bin/rspamd -f -u _rspamd -g _rspamd; elif id rspamd >/dev/null 2>&1; then exec /usr/bin/rspamd -f -u rspamd -g rspamd; else exec /usr/bin/rspamd -f --insecure; fi'
 autostart=true
 autorestart=true
 stdout_logfile=/dev/fd/1