From b8f5f150ae37aae17802c50e16d1f6c467119f0e Mon Sep 17 00:00:00 2001
From: cnphpbb <moqiruyi@126.com>
Date: Sun, 31 Aug 2025 17:30:28 +0800
Subject: [PATCH] =?UTF-8?q?refactor(ntfy):=20=E6=9B=B4=E6=96=B0=E5=AE=B9?=
 =?UTF-8?q?=E5=99=A8=E9=85=8D=E7=BD=AE=E5=92=8C=E5=8D=B7=E6=8C=82=E8=BD=BD?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将缓存、配置和附件目录合并到单一lib目录
- 添加web推送相关配置项
- 更新基础URL为服务名称
---
 ntfy/stack.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ntfy/stack.yml b/ntfy/stack.yml
index 6917d96..8c610f1 100644
--- a/ntfy/stack.yml
+++ b/ntfy/stack.yml
@@ -1,4 +1,4 @@
-# mkdir -pv /data/volumes/ntfy/{cache,etc,attachments}
+# mkdir -pv /data/volumes/ntfy/lib
 # pull:: docker compose -p ntfy --env-file ./ntfy/env.cfg -f ./ntfy/stack.yml pull
 # run:: docker compose -p ntfy --env-file ./ntfy/env.cfg -f ./ntfy/stack.yml up -d
 
@@ -15,16 +15,18 @@ services:
       - '5480:80'
     environment:
       - TZ=Asia/Shanghai
-      - NTFY_BASE_URL=http://192.168.10.61:5480
+      - NTFY_BASE_URL=<http://ntfy:80>
       - NTFY_CACHE_FILE=/var/lib/ntfy/cache.db #缓存数据
       - NTFY_AUTH_FILE=/var/lib/ntfy/auth.db #授权数据
       - NTFY_AUTH_DEFAULT_ACCESS=deny-all  #禁用非授权访问
       - NTFY_BEHIND_PROXY=true
       - NTFY_ATTACHMENT_CACHE_DIR=/var/lib/ntfy/attachments #设置附件缓存目录
       - NTFY_ENABLE_LOGIN=true #开启登录授权访问
+      - NTFY_WEB_PUSH_PUBLIC_KEY= <public_key>
+      - NTFY_WEB_PUSH_PRIVATE_KEY= <private_key>
+      - NTFY_WEB_PUSH_FILE=/var/lib/ntfy/webpush.db #设置web推送数据文件
+      - NTFY_WEB_PUSH_EMAIL_ADDRESS= <email>
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - /etc/timezone:/etc/timezone:ro
-      - ${Volumes_Path}/cache:/var/cache/ntfy
-      - ${Volumes_Path}/etc:/etc/ntfy/ntfy.conf
-      - ${Volumes_Path}/attachments:/var/lib/ntfy/attachments
+      - ${Volumes_Path}/lib:/var/lib/ntfy