From d172fce34c18b27f2acd17037fdc405cc0f4a19b Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 25 Dec 2025 22:31:53 +0800
Subject: [PATCH 1/2] :memo: Add TrueNAS Hosting section to README
https://github.com/siyuan-note/siyuan/pull/16697
Signed-off-by: Daniel <845765@qq.com>
---
README.md | 16 ++++++++--------
README_ja_JP.md | 37 +++++++++++++++++++++++++++++++++++++
README_tr_TR.md | 37 +++++++++++++++++++++++++++++++++++++
README_zh_CN.md | 45 +++++++++++++++++++++++++++++++++++++++++----
4 files changed, 123 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
index 41db1c02e..bd1dff43f 100644
--- a/README.md
+++ b/README.md
@@ -319,19 +319,19 @@ Publish parameters: --accessAuthCode=******(Access authorization code)
TrueNAS Deployment
-Note: First run below commands in the TrueNAS Shell. please update Pool_1/Apps_Data/siyuan to match your dataset for Apps
+Note: First run below commands in the TrueNAS Shell. please update `Pool_1/Apps_Data/siyuan to match your dataset for Apps.
-`zfs create Pool_1/Apps_Data/siyuan`
+```shell
+zfs create Pool_1/Apps_Data/siyuan
+chown -R 1001:1002 /mnt/Pool_1/Apps_Data/siyuan
+chmod 755 /mnt/Pool_1/Apps_Data/siyuan
+```
-`chown -R 1001:1002 /mnt/Pool_1/Apps_Data/siyuan`
-
-`chmod 755 /mnt/Pool_1/Apps_Data/siyuan`
-
-Navigate to Apps --> DiscoverApps --> More Options(on top right, besies Custom App) --> Install via YAML
+Navigate to Apps - DiscoverApps - More Options(on top right, besies Custom App) - Install via YAML
Template reference:
-```
+```yaml
services:
siyuan:
image: b3log/siyuan
diff --git a/README_ja_JP.md b/README_ja_JP.md
index 949afab2e..b52e522ae 100644
--- a/README_ja_JP.md
+++ b/README_ja_JP.md
@@ -43,6 +43,7 @@
* [パッケージマネージャー](#パッケージマネージャー)
* [Docker ホスティング](#docker-ホスティング)
* [Unraid ホスティング](#unraid-ホスティング)
+ * [TrueNas ホスティング](#truenas-ホスティング)
* [インサイダープレビュー](#インサイダープレビュー)
* [🏘️ コミュニティ](#️-コミュニティ)
* [🛠️ 開発ガイド](#️-開発ガイド)
@@ -312,6 +313,42 @@ Publish parameters: --accessAuthCode=******（アクセス認証コード）
+### TrueNas ホスティング
+
+
+TrueNasデプロイメント
+
+注意：まず TrueNAS Shell で以下のコマンドを実行してください。`Pool_1/Apps_Data/siyuan` をアプリ用のデータセットパスに合わせて更新してください。
+
+```shell
+zfs create Pool_1/Apps_Data/siyuan
+chown -R 1001:1002 /mnt/Pool_1/Apps_Data/siyuan
+chmod 755 /mnt/Pool_1/Apps_Data/siyuan
+```
+
+Apps - DiscoverApps - More Options（右上、Custom App を除く）- YAML でインストール に移動してください
+
+テンプレート例：
+
+```yaml
+services:
+ siyuan:
+ image: b3log/siyuan
+ container_name: siyuan
+ command: ['--workspace=/siyuan/workspace/', '--accessAuthCode=2222']
+ ports:
+ - 6806:6806
+ volumes:
+ - /mnt/Pool_1/Apps_Data/siyuan:/siyuan/workspace # Adjust to your dataset path
+ restart: unless-stopped
+ environment:
+ - TZ=America/Los_Angeles # Replace with your timezone if needed
+ - PUID=1001
+ - PGID=1002
+```
+
+
+
### インサイダープレビュー
主要な更新前にインサイダープレビューをリリースします。詳細は[https://github.com/siyuan-note/insider](https://github.com/siyuan-note/insider)をご覧ください。
diff --git a/README_tr_TR.md b/README_tr_TR.md
index 0f515da1f..c8e9dc54f 100644
--- a/README_tr_TR.md
+++ b/README_tr_TR.md
@@ -43,6 +43,7 @@
* [Paket Yöneticisi](#paket-yöneticisi)
* [Docker Barındırma](#docker-barındırma)
* [Unraid Barındırma](#unraid-barındırma)
+ * [TrueNAS Barındırma](#truenas-barındırma)
* [Erken Önizleme (Insider Preview)](#erken-önizleme-insider-preview)
* [🏘️ Topluluk](#️-topluluk)
* [🛠️ Geliştirme Rehberi](#️-geliştirme-rehberi)
@@ -313,6 +314,42 @@ Publish parameters: --accessAuthCode=******(Access authorization code)
+### TrueNAS Barındırma
+
+
+TrueNAS Dağıtım Dokümanı
+
+Not: Önce TrueNAS Shell'te aşağıdaki komutları çalıştırın. Lütfen `Pool_1/Apps_Data/siyuan` yolunu uygulamanızın dataset'ine göre güncelleyin。
+
+```shell
+zfs create Pool_1/Apps_Data/siyuan
+chown -R 1001:1002 /mnt/Pool_1/Apps_Data/siyuan
+chmod 755 /mnt/Pool_1/Apps_Data/siyuan
+```
+
+Apps --> DiscoverApps --> More Options (sağ üst, Custom App hariç) --> YAML ile Yükle bölümüne gidin
+
+Şablon örneği：
+
+```yaml
+services:
+ siyuan:
+ image: b3log/siyuan
+ container_name: siyuan
+ command: ['--workspace=/siyuan/workspace/', '--accessAuthCode=2222']
+ ports:
+ - 6806:6806
+ volumes:
+ - /mnt/Pool_1/Apps_Data/siyuan:/siyuan/workspace # Adjust to your dataset path
+ restart: unless-stopped
+ environment:
+ - TZ=America/Los_Angeles # Replace with your timezone if needed
+ - PUID=1001
+ - PGID=1002
+```
+
+
+
### Erken Önizleme (Insider Preview)
Büyük güncellemelerden önce erken erişim (Insider Preview) sürümlerini yayınlıyoruz. Lütfen [https://github.com/siyuan-note/insider](https://github.com/siyuan-note/insider) adresini ziyaret edin.
diff --git a/README_zh_CN.md b/README_zh_CN.md
index dc17c9266..6570af752 100644
--- a/README_zh_CN.md
+++ b/README_zh_CN.md
@@ -43,9 +43,10 @@
* [包管理器](#包管理器)
* [Docker 部署](#docker-部署)
* [Unraid 部署](#unraid-部署)
- * [宝塔面板 部署](#宝塔面板部署)
- * [小皮面板 部署](#小皮面板部署)
- * [1Panel面板 部署](#1Panel面板部署)
+ * [TrueNAS 部署](#trueNAS-部署)
+ * [宝塔面板部署](#宝塔面板部署)
+ * [小皮面板部署](#小皮面板部署)
+ * [1Panel 面板部署](#1Panel-面板部署)
* [内部预览版](#内部预览版)
* [🏘️ 社区](#️-社区)
* [🛠️ 开发指南](#️-开发指南)
@@ -318,6 +319,42 @@ Publish parameters: --accessAuthCode=******（访问授权码）
+### TrueNAS 部署
+
+
+TrueNAS 部署文档
+
+注意：首先在 TrueNAS Shell 中运行下面的命令。请将 `Pool_1/Apps_Data/siyuan` 更新为与你的应用数据集对应的路径。
+
+```shell
+zfs create Pool_1/Apps_Data/siyuan
+chown -R 1001:1002 /mnt/Pool_1/Apps_Data/siyuan
+chmod 755 /mnt/Pool_1/Apps_Data/siyuan
+```
+
+进入 Apps - DiscoverApps - More Options（右上，除 Custom App 外）- 通过 YAML 安装
+
+模板参考：
+
+```yaml
+services:
+ siyuan:
+ image: b3log/siyuan
+ container_name: siyuan
+ command: ['--workspace=/siyuan/workspace/', '--accessAuthCode=2222']
+ ports:
+ - 6806:6806
+ volumes:
+ - /mnt/Pool_1/Apps_Data/siyuan:/siyuan/workspace # Adjust to your dataset path
+ restart: unless-stopped
+ environment:
+ - TZ=America/Los_Angeles # Replace with your timezone if needed
+ - PUID=1001
+ - PGID=1002
+```
+
+
+
### 宝塔面板部署
@@ -373,7 +410,7 @@ Publish parameters: --accessAuthCode=******（访问授权码）
-### 1Panel面板部署
+### 1Panel 面板部署
1Panel面板 部署文档
From 5db1723bfc56a5cc945c48da7e30b3703cc567ad Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 25 Dec 2025 22:33:10 +0800
Subject: [PATCH 2/2] :art: Improve minimum version requirements for
marketplace packages https://github.com/siyuan-note/siyuan/issues/16688
Signed-off-by: Daniel <845765@qq.com>
---
kernel/bazaar/icon.go | 5 +----
kernel/bazaar/package.go | 29 +++++++++++++++--------------
kernel/bazaar/plugin.go | 5 +----
kernel/bazaar/template.go | 4 +---
kernel/bazaar/theme.go | 4 +---
kernel/bazaar/widget.go | 4 +---
6 files changed, 20 insertions(+), 31 deletions(-)
diff --git a/kernel/bazaar/icon.go b/kernel/bazaar/icon.go
index 49799348b..aae5697dd 100644
--- a/kernel/bazaar/icon.go
+++ b/kernel/bazaar/icon.go
@@ -85,10 +85,7 @@ func Icons() (icons []*Icon) {
return
}
- if disallowDisplayBazaarPackage(icon.Package) {
- return
- }
-
+ icon.DisallowInstall = disallowInstallBazaarPackage(icon.Package)
icon.URL = strings.TrimSuffix(icon.URL, "/")
repoURLHash := strings.Split(repoURL, "@")
icon.RepoURL = "https://github.com/" + repoURLHash[0]
diff --git a/kernel/bazaar/package.go b/kernel/bazaar/package.go
index 2bf6bb339..dd53ef473 100644
--- a/kernel/bazaar/package.go
+++ b/kernel/bazaar/package.go
@@ -130,19 +130,20 @@ type Package struct {
PreviewURLThumb string `json:"previewURLThumb"`
IconURL string `json:"iconURL"`
- Installed bool `json:"installed"`
- Outdated bool `json:"outdated"`
- Current bool `json:"current"`
- Updated string `json:"updated"`
- Stars int `json:"stars"`
- OpenIssues int `json:"openIssues"`
- Size int64 `json:"size"`
- HSize string `json:"hSize"`
- InstallSize int64 `json:"installSize"`
- HInstallSize string `json:"hInstallSize"`
- HInstallDate string `json:"hInstallDate"`
- HUpdated string `json:"hUpdated"`
- Downloads int `json:"downloads"`
+ Installed bool `json:"installed"`
+ Outdated bool `json:"outdated"`
+ Current bool `json:"current"`
+ Updated string `json:"updated"`
+ Stars int `json:"stars"`
+ OpenIssues int `json:"openIssues"`
+ Size int64 `json:"size"`
+ HSize string `json:"hSize"`
+ InstallSize int64 `json:"installSize"`
+ HInstallSize string `json:"hInstallSize"`
+ HInstallDate string `json:"hInstallDate"`
+ HUpdated string `json:"hUpdated"`
+ Downloads int `json:"downloads"`
+ DisallowInstall bool `json:"disallowInstall"`
Incompatible bool `json:"incompatible"`
}
@@ -990,7 +991,7 @@ func getBazaarIndex() map[string]*bazaarPackage {
// Add marketplace package config item `minAppVersion` https://github.com/siyuan-note/siyuan/issues/8330
const defaultMinAppVersion = "2.9.0"
-func disallowDisplayBazaarPackage(pkg *Package) bool {
+func disallowInstallBazaarPackage(pkg *Package) bool {
if "" == pkg.MinAppVersion {
pkg.MinAppVersion = defaultMinAppVersion
}
diff --git a/kernel/bazaar/plugin.go b/kernel/bazaar/plugin.go
index e3c91a5e1..2d99d4f31 100644
--- a/kernel/bazaar/plugin.go
+++ b/kernel/bazaar/plugin.go
@@ -87,10 +87,7 @@ func Plugins(frontend string) (plugins []*Plugin) {
return
}
- if disallowDisplayBazaarPackage(plugin.Package) {
- return
- }
-
+ plugin.DisallowInstall = disallowInstallBazaarPackage(plugin.Package)
plugin.Incompatible = isIncompatiblePlugin(plugin, frontend)
plugin.URL = strings.TrimSuffix(plugin.URL, "/")
diff --git a/kernel/bazaar/template.go b/kernel/bazaar/template.go
index 7c09ee869..b1f67b24f 100644
--- a/kernel/bazaar/template.go
+++ b/kernel/bazaar/template.go
@@ -86,9 +86,7 @@ func Templates() (templates []*Template) {
return
}
- if disallowDisplayBazaarPackage(template.Package) {
- return
- }
+ template.DisallowInstall = disallowInstallBazaarPackage(template.Package)
template.URL = strings.TrimSuffix(template.URL, "/")
repoURLHash := strings.Split(repoURL, "@")
diff --git a/kernel/bazaar/theme.go b/kernel/bazaar/theme.go
index f9146a08a..ea8d957f2 100644
--- a/kernel/bazaar/theme.go
+++ b/kernel/bazaar/theme.go
@@ -87,9 +87,7 @@ func Themes() (ret []*Theme) {
return
}
- if disallowDisplayBazaarPackage(theme.Package) {
- return
- }
+ theme.DisallowInstall = disallowInstallBazaarPackage(theme.Package)
theme.URL = strings.TrimSuffix(theme.URL, "/")
repoURLHash := strings.Split(repoURL, "@")
diff --git a/kernel/bazaar/widget.go b/kernel/bazaar/widget.go
index 31bb0f758..7f0a0cc88 100644
--- a/kernel/bazaar/widget.go
+++ b/kernel/bazaar/widget.go
@@ -85,9 +85,7 @@ func Widgets() (widgets []*Widget) {
return
}
- if disallowDisplayBazaarPackage(widget.Package) {
- return
- }
+ widget.DisallowInstall = disallowInstallBazaarPackage(widget.Package)
widget.URL = strings.TrimSuffix(widget.URL, "/")
repoURLHash := strings.Split(repoURL, "@")