From 57e766967760f2c9f9631cefc7536ed367e5cbf9 Mon Sep 17 00:00:00 2001 From: waxgourd Date: Wed, 24 Jan 2024 17:45:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=8E=A8=E5=87=BAautman?= =?UTF-8?q?=E3=80=81imaotai=E3=80=81onenav=EF=BC=9B=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=96=87=E4=BB=B6=E8=A7=84=E8=8C=83=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MyIP/CHANGELOG.md | 5 +- MyIP/DOCS.md | 4 +- MyIP/README.md | 5 +- NeteaseCloudMusicApi/DOCS.md | 6 +- NeteaseCloudMusicApi/README.md | 2 +- README.md | 10 + alist/CHANGELOG.md | 4 +- alist/DOCS.md | 11 +- alist/README.md | 4 +- autman/CHANGELOG.md | 3 + autman/DOCS.md | 9 + autman/README.md | 9 + autman/config.yaml | 15 ++ autman/icon.png | Bin 0 -> 3381 bytes autman/logo.png | Bin 0 -> 3381 bytes boost/CHANGELOG.md | 5 +- boost/DOCS.md | 5 +- boost/README.md | 6 +- ddnsto/CHANGELOG.md | 8 +- ddnsto/DOCS.md | 13 + ddnsto/README.md | 22 +- ddnsto/config.yaml | 1 - emby/CHANGELOG.md | 17 +- emby/DOCS.md | 18 +- emby/README.md | 2 +- emby/config.json | 3 +- filebrowser/DOCS.md | 43 ++- filebrowser/README.md | 8 +- haos_turbo/CHANGELOG.md | 4 +- haos_turbo/DOCS.md | 22 +- haos_turbo/README.md | 34 ++- imaotai/CHANGELOG.md | 3 + imaotai/DOCS.md | 38 +++ imaotai/README.md | 9 + imaotai/config.yaml | 20 ++ imaotai/icon.png | Bin 0 -> 20788 bytes imaotai/logo.png | Bin 0 -> 20788 bytes mi-scale/CHANGELOG.md | 3 +- mi-scale/DOCS.md | 92 +++---- mi-scale/README.md | 2 +- mpd/CHANGELOG.md | 4 +- mpd/DOCS.md | 41 +-- mpd/README.md | 4 +- nextcloud/CHANGELOG.md | 27 +- nextcloud/DOCS.md | 46 ++-- nextcloud/README.md | 10 +- onelist/CHANGELOG.md | 4 +- onelist/DOCS.md | 11 +- onelist/README.md | 14 +- onenav/CHANGELOG.md | 3 + onenav/DOCS.md | 11 + onenav/README.md | 9 + onenav/apparmor.txt | 66 +++++ onenav/config.yaml | 42 +++ onenav/icon.png | Bin 0 -> 5628 bytes onenav/logo.png | Bin 0 -> 5628 bytes portainer/CHANGELOG.md | 3 +- portainer/DOCS.md | 19 +- portainer/README.md | 4 +- qinglong/CHANGELOG.md | 2 +- qinglong/DOCS.md | 4 +- qinglong/README.md | 9 +- samba-easy-nas/CHANGELOG.md | 6 +- samba-easy-nas/DOCS.md | 27 +- samba-easy-nas/README.md | 10 +- zigbee2mqtt/CHANGELOG.md | 461 +-------------------------------- zigbee2mqtt/DOCS.md | 13 +- zigbee2mqtt/README.md | 2 +- 68 files changed, 556 insertions(+), 761 deletions(-) create mode 100644 autman/CHANGELOG.md create mode 100644 autman/DOCS.md create mode 100644 autman/README.md create mode 100644 autman/config.yaml create mode 100644 autman/icon.png create mode 100644 autman/logo.png create mode 100644 ddnsto/DOCS.md create mode 100644 imaotai/CHANGELOG.md create mode 100644 imaotai/DOCS.md create mode 100644 imaotai/README.md create mode 100644 imaotai/config.yaml create mode 100644 imaotai/icon.png create mode 100644 imaotai/logo.png create mode 100644 onenav/CHANGELOG.md create mode 100644 onenav/DOCS.md create mode 100644 onenav/README.md create mode 100644 onenav/apparmor.txt create mode 100644 onenav/config.yaml create mode 100644 onenav/icon.png create mode 100644 onenav/logo.png diff --git a/MyIP/CHANGELOG.md b/MyIP/CHANGELOG.md index 171ebdb..db8c3ca 100644 --- a/MyIP/CHANGELOG.md +++ b/MyIP/CHANGELOG.md @@ -1,4 +1,3 @@ -## 2023-12-10 - -from https://github.com/jason5ng32/MyIP +### 1.0（2023-12-10） +- 首次推出 \ No newline at end of file diff --git a/MyIP/DOCS.md b/MyIP/DOCS.md index c20726a..18dc437 100644 --- a/MyIP/DOCS.md +++ b/MyIP/DOCS.md @@ -1,3 +1,5 @@ # MyIP -涓涓洿濂界殑 IP 宸ュ叿绠便傚彲浠ユ煡鐪婭P銆両P 淇℃伅锛堜唬鐞嗗墠鍚庯級銆佹鏌 DNS 娉勯湶銆佹鏌 WebRTC 杩炴帴銆佺綉閫熸祴璇曘佹祴璇曠綉绔欏彲鐢ㄦх瓑銆 +## 浣跨敤鏂规硶 + +- 鍚姩鍚庡彲鍦ㄤ俊鎭〉涓偣鍑"鎵撳紑 WEI UI"锛屼篃鍙氳繃娴忚鍣ㄨ闂 锛堢鍙ｅ彿榛樿8966锛. \ No newline at end of file diff --git a/MyIP/README.md b/MyIP/README.md index 820312e..abf47b6 100644 --- a/MyIP/README.md +++ b/MyIP/README.md @@ -1,10 +1,10 @@ -# 鍐摐鐢勯塧ddons:MyIP +# 鍐摐鐢勯塧ddons锛歁yIP ## 鍏充簬 灏嗚IP宸ュ叿鏀圭敤Web鐗堬紝闆嗘垚鍒癏A涓 -## 馃憖 涓昏鍔熻兘 +### 馃憖 涓昏鍔熻兘 - 馃枼锔 **鐪嬭嚜宸辩殑 IP**锛氫粠澶氫釜 IPv4 鍜 IPv6 鏉ユ簮妫娴嬫樉绀烘湰鏈虹殑 IP - 馃暤锔 **鐪 IP 淇℃伅**锛氭樉绀烘墍鏈 IP 鐨勭浉鍏充俊鎭紝鍖呮嫭鍥藉銆佸湴鍖恒丄SN銆佸湴鐞嗕綅缃瓑 @@ -23,4 +23,3 @@ ## 鏉ユ簮 https://github.com/jason5ng32/MyIP/ - diff --git a/NeteaseCloudMusicApi/DOCS.md b/NeteaseCloudMusicApi/DOCS.md index 4b18595..825186f 100644 --- a/NeteaseCloudMusicApi/DOCS.md +++ b/NeteaseCloudMusicApi/DOCS.md @@ -1,11 +1,7 @@ # 缃戞槗浜戦煶涔怉PI -缃戞槗浜戦煶涔 Node.js API service - - - ## 閰嶇疆璇存槑 ### 缃戠粶 -鏇存敼姝や富鏈轰笂鐢卞姞杞介」寮鍙戠殑绔彛锛岄粯璁3000锛屽彲鑷閰嶇疆 +- 鏇存敼姝や富鏈轰笂鐢卞姞杞介」寮鍙戠殑绔彛锛岄粯璁3000锛屽彲鑷閰嶇疆 \ No newline at end of file diff --git a/NeteaseCloudMusicApi/README.md b/NeteaseCloudMusicApi/README.md index b92ee2f..7090720 100644 --- a/NeteaseCloudMusicApi/README.md +++ b/NeteaseCloudMusicApi/README.md @@ -1,4 +1,4 @@ -# 鍐摐鐢勯塧ddons: NeteaseCloudMusicApi +# 鍐摐鐢勯塧ddons锛歂eteaseCloudMusicApi ## 鍏充簬 diff --git a/README.md b/README.md index 2aa604a..762044b 100644 --- a/README.md +++ b/README.md @@ -83,3 +83,13 @@ AList鏄竴涓敮鎸佸绉嶅瓨鍌紝鏀寔缃戦〉娴忚鍜 WebDAV 鐨勬枃浠跺垪琛 ✓ [onelist](onelist/) : 涓涓被浼糴mby鐨勪笓娉ㄤ簬鍒墛alist鑱氬悎缃戠洏褰㈡垚褰辫濯掍綋搴撶殑绋嬪簭銆 + +✓ [autMan](autman/) : +autMan鏄釜鎵╁睍鎬ф瀬寮虹殑宸ュ叿 +杩欐槸涓娆惧姛鑳藉己澶х殑鑷姩鍖栬蒋浠剁郴缁燂紝瀹冩敮鎸佸璇█鎻掍欢銆佸鑴氭湰杩愯銆佽繑鍒╁姛鑳姐佷笌鍗虫椂閫氳骞冲彴鐨勫鎺ワ紝浠ュ強鑷畾涔夊井鏈嶅姟璺敱銆傝繖浣垮叾閫傜敤浜庡悇绉嶈嚜鍔ㄥ寲浠诲姟鍜屽畾鍒跺姛鑳界殑寮鍙戙 + +✓ [OneNav](onenav/) : +浣跨敤PHP + SQLite 3寮鍙戠殑涔︾绠＄悊绯荤粺锛屽皢娴忚鍣ㄤ功绛鹃泦涓紡绠＄悊锛屽仛鍒颁竴澶勯儴缃诧紝闅忓璁块棶銆 + +✓ [imaotai](imaotai/) : +i鑼呭彴app鎺ュ彛鑷姩鍖栨寕鏈洪绾︺ \ No newline at end of file diff --git a/alist/CHANGELOG.md b/alist/CHANGELOG.md index 6449469..309fdb0 100644 --- a/alist/CHANGELOG.md +++ b/alist/CHANGELOG.md @@ -1,3 +1,3 @@ -## v3.30.0 +### v3.30.0 锛2024-01-11锛 - - 棣栨鍙戝竷銆 \ No newline at end of file +- 棣栨鎺ㄥ嚭 \ No newline at end of file diff --git a/alist/DOCS.md b/alist/DOCS.md index 9ff2cc7..e490812 100644 --- a/alist/DOCS.md +++ b/alist/DOCS.md @@ -1,16 +1,13 @@ # Alist -涓涓敮鎸佸涓瓨鍌ㄧ殑鏂囦欢鍒楄〃绋嬪簭銆 - ## 閰嶇疆璇存槑 ### 鏇存敼姝や富鏈轰笂鐢卞姞杞介」寮鏀剧殑绔彛锛 -榛樿5244锛屽彲鑷淇敼 +- 榛樿绔彛鍙凤細5244锛屽彲鑷淇敼 -鍙互閫氳繃娴忚鍣ㄩ〉闈㈣闂 锛堢鍙ｅ彿榛樿5244锛 +- 鍙互閫氳繃娴忚鍣ㄩ〉闈㈣闂 锛堢鍙ｅ彿榛樿5244锛 -榛樿鐢ㄦ埛鍚: "admin" 瀵嗙爜: "admin" - -璇︾粏浣跨敤鎸囧崡锛岃杩涘叆锛歨ttps://alist.nn.ci/zh/guide/ 鏌ョ湅 +- 榛樿鐢ㄦ埛鍚: "admin" 瀵嗙爜: "admin" +- 璇︾粏浣跨敤鎸囧崡锛岃杩涘叆锛歨ttps://alist.nn.ci/zh/guide/ 鏌ョ湅 \ No newline at end of file diff --git a/alist/README.md b/alist/README.md index 0ec8945..73e6599 100644 --- a/alist/README.md +++ b/alist/README.md @@ -1,6 +1,4 @@ -# 鍐摐鐢勯塧ddons: Alist - - +# 鍐摐鐢勯塧ddons锛欰list ## 鍏充簬 diff --git a/autman/CHANGELOG.md b/autman/CHANGELOG.md new file mode 100644 index 0000000..172ddc7 --- /dev/null +++ b/autman/CHANGELOG.md @@ -0,0 +1,3 @@ +### 1.0.0锛2024-01-16锛 + +- 棣栨鎺ㄥ嚭 \ No newline at end of file diff --git a/autman/DOCS.md b/autman/DOCS.md new file mode 100644 index 0000000..6edc5c5 --- /dev/null +++ b/autman/DOCS.md @@ -0,0 +1,9 @@ +# autMan + +## 浣跨敤鏂规硶 + +- 鐐瑰嚮鍚姩锛岃繘鍏ユ棩蹇楅〉闈腑鐐瑰嚮鍒锋柊锛屽嚭鐜扳淗ttp鏈嶅姟宸茶繍琛(8080)銆傗濆垯琛ㄧず鍚姩鎴愬姛銆 + +- 鍚姩瀹屾垚鍚庡彲鍦ㄤ俊鎭〉涓偣鍑"鎵撳紑 WEI UI"锛屾垨鐐瑰嚮鈥滃湪渚ц竟鏍忔樉绀衡濓紝鏂逛究浠ュ悗浠庡乏渚ф爮蹇熻闂 + +- 濡傝繍琛屾湁閿欒鍒欏湪淇℃伅椤典腑鍏抽棴鈥滀繚鎶ゆā寮忊濄 \ No newline at end of file diff --git a/autman/README.md b/autman/README.md new file mode 100644 index 0000000..f14f9fb --- /dev/null +++ b/autman/README.md @@ -0,0 +1,9 @@ +# 鍐摐鐢勯塧ddons锛歛utMan + +## 鍏充簬 + +杩欐槸涓娆惧姛鑳藉己澶х殑鑷姩鍖栬蒋浠剁郴缁燂紝瀹冩敮鎸佸璇█鎻掍欢銆佸鑴氭湰杩愯銆佽繑鍒╁姛鑳姐佷笌鍗虫椂閫氳骞冲彴鐨勫鎺ワ紝浠ュ強鑷畾涔夊井鏈嶅姟璺敱銆傝繖浣垮叾閫傜敤浜庡悇绉嶈嚜鍔ㄥ寲浠诲姟鍜屽畾鍒跺姛鑳界殑寮鍙戙 + +## 鏉ユ簮 + +https://github.com/hdbjlizhe/fanli \ No newline at end of file diff --git a/autman/config.yaml b/autman/config.yaml new file mode 100644 index 0000000..aff7208 --- /dev/null +++ b/autman/config.yaml @@ -0,0 +1,15 @@ +name: 濂ョ壒鏇兼満鍣ㄤ汉 +slug: autman +codenotary: wghaos@163.com +description: '鏈哄櫒浜鸿嚜鍔ㄥ寲宸ュ叿' +url: https://gitcode.com/waxgourd/addons +version: 1.0.0 +image: wghaos/autman +init: false +docker_api: true +arch: + - aarch64 + - amd64 +webui: "[PROTO:http]://[HOST]:[PORT:8162]" +ports: + 8080/tcp: 8162 diff --git a/autman/icon.png b/autman/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4f976d6e35fcddad1ef983165e0f14f8207547d0 GIT binary patch literal 3381 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 LNkvXXu0mjfZ>Vx& literal 0 HcmV?d00001 diff --git a/autman/logo.png b/autman/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..4f976d6e35fcddad1ef983165e0f14f8207547d0 GIT binary patch literal 3381 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 LNkvXXu0mjfZ>Vx& literal 0 HcmV?d00001 diff --git a/boost/CHANGELOG.md b/boost/CHANGELOG.md index 6a89907..1b7ad53 100644 --- a/boost/CHANGELOG.md +++ b/boost/CHANGELOG.md @@ -1,2 +1,3 @@ -## 1.0.1锛2023-12-10锛 -- 棣栨鎻愪氦 \ No newline at end of file +### 1.0.1锛2023-12-10锛 + +- 棣栨鎺ㄥ嚭 \ No newline at end of file diff --git a/boost/DOCS.md b/boost/DOCS.md index d93ca57..c6a3bfe 100644 --- a/boost/DOCS.md +++ b/boost/DOCS.md @@ -1,8 +1,5 @@ # HA鍋ュ悍妫娴 - - ## 閰嶇疆璇存槑 -鍚姩鍓嶄竴瀹氳鍦ㄤ俊鎭〉闈腑鍏抽棴 淇濇姢妯″紡銆 - +- 鍚姩鍓嶄竴瀹氳鍦ㄤ俊鎭〉闈腑鍏抽棴 淇濇姢妯″紡銆 \ No newline at end of file diff --git a/boost/README.md b/boost/README.md index 88cd11f..3e1b2e5 100644 --- a/boost/README.md +++ b/boost/README.md @@ -4,4 +4,8 @@ 杩欐槸涓娆綡AOS缁煎悎缃戠粶璁块棶鍋ュ悍搴︽鏌ョ殑搴旂敤锛屽叿鏈夎繍琛岀姸鎬併佺綉缁滅姸鎬併佺綉缁滃搷搴旀娴嬬瓑鍔熻兘銆 -娉細鍐摐HAOS 11.3浠ヤ笂鏀寔host缃戠粶妫娴嬶紝鍏朵粬HAOS鐨刪ost閮ㄥ垎鏃犳硶妫娴嬶紝浼氭樉绀轰负绌虹櫧銆 +**娉細鍐摐HAOS 11.3浠ヤ笂鏀寔host缃戠粶妫娴嬶紝鍏朵粬HAOS鐨刪ost閮ㄥ垎鏃犳硶妫娴嬶紝浼氭樉绀轰负绌虹櫧銆 ** + +## 鏉ユ簮 + +鍐摐鐢勯夊嚭鍝 \ No newline at end of file diff --git a/ddnsto/CHANGELOG.md b/ddnsto/CHANGELOG.md index e4b8ee7..6534ef4 100644 --- a/ddnsto/CHANGELOG.md +++ b/ddnsto/CHANGELOG.md @@ -1,7 +1,7 @@ -## 3.0.6 - [2024-01-18] +### 3.0.6锛2024-01-18锛 - - 淇 濉啓token杩樹笉鑳芥甯稿惎鍔ㄧ殑闂 +- 淇 濉啓token杩樹笉鑳芥甯稿惎鍔ㄧ殑闂 -## 3.0.5 +### 3.0.5锛2023-12-29锛 - - 棣栨鍙戝竷銆 \ No newline at end of file +- 棣栨鎺ㄥ嚭 \ No newline at end of file diff --git a/ddnsto/DOCS.md b/ddnsto/DOCS.md new file mode 100644 index 0000000..708a78d --- /dev/null +++ b/ddnsto/DOCS.md @@ -0,0 +1,13 @@ +# DDNSTO + +## 浣跨敤鏂规硶 + +- 鍦ㄩ厤缃〉涓緭鍏モ滅敤鎴稵oken鈥濓紝[瀹樻柟缃戠珯](https://www.ddnsto.com/) + +- 閫夋嫨鈥滆澶囩紪鍙封濆悗鐐瑰嚮鍚姩銆 + +- 杩斿洖鍒板畼缃戯紝鍦ㄦ帶鍒跺彴涓垜鐨勮澶囦腑锛屾坊鍔犲煙鍚嶆槧灏勩 + +- 涓诲煙鍚嶈嚜瀹氫箟濉ソ锛岀洰鏍囦富鏈哄湴鍧灏辨槸浣燞AOS鐨処P鍦板潃鍜岀鍙ｅ彿銆備緥濡傦紙http://192.168.1.100:8123)锛岀偣鍑绘洿鏂 + +- 鍦ㄤ富鍩熷悕涓嬮潰灏辨槸鍙互閫氳繃鍏綉璁块棶鐨勫湴鍧浜嗐傚揩鍘昏瘯璇曞惂锛侌煒 \ No newline at end of file diff --git a/ddnsto/README.md b/ddnsto/README.md index cbaedd8..47084fc 100644 --- a/ddnsto/README.md +++ b/ddnsto/README.md @@ -1,25 +1,9 @@ -# 鍐摐鐢勯塧ddons: DDNSTO +# 鍐摐鐢勯塧ddons锛欴DNSTO ## 鍏充簬 -闈濪DNSTO瀹樻柟鍙戝竷鐨勭涓夋柟鎻掍欢銆 - - +DDNSTO 甯姪浣犲揩閫熷缃戠┛閫忚闂綘鐨勫眬鍩熺綉璁惧锛屾棤闇鍏綉 IP ## 鏉ユ簮 -https://github.com/TomCzHen/ddnsto-hassio - - - -鍘熶綔鑰呭啓鏄庯細 - -**娉ㄦ剰: 鏈彃浠跺苟闈 DDNSTO 瀹樻柟鍙戝竷銆** - -閰嶇疆浣跨敤璇锋煡鐪 [https://doc.linkease.com/zh/guide/ddnsto/](https://doc.linkease.com/zh/guide/ddnsto/) - - - -璇勪环锛 - -璁ょ湡鍋氬ソ鐨勫甫姹夊寲鐨勬彃浠讹紒 \ No newline at end of file +鍐摐鐢勯夊嚭鍝 \ No newline at end of file diff --git a/ddnsto/config.yaml b/ddnsto/config.yaml index 5ddd65a..7d7abe4 100644 --- a/ddnsto/config.yaml +++ b/ddnsto/config.yaml @@ -3,7 +3,6 @@ slug: ddnsto version: "v3.0.6" description: "DDNSTO 鏄竴娆剧ǔ瀹氥佸揩閫熴佺畝鍗曟槗鐢ㄧ殑鍐呯綉绌块忓伐鍏" url: https://gitcode.com/waxgourd/addons -# codenotary: wghaos@163.com startup: services init: false apparmor: false diff --git a/emby/CHANGELOG.md b/emby/CHANGELOG.md index 2fd051b..9053621 100644 --- a/emby/CHANGELOG.md +++ b/emby/CHANGELOG.md @@ -1,18 +1,23 @@ +### 4.8.0.67锛13-01-2024锛 -## 4.8.0.67 (13-01-2024) - 鍗囩骇鍒發inuxserver/docker-emby鏈鏂扮増 -## 4.8.0.66 (06-01-2024) +### 4.8.0.66锛06-01-2024锛 + - 鍗囩骇鍒發inuxserver/docker-emby鏈鏂扮増 -## 4.8.0.65 (30-12-2023) +### 4.8.0.65锛30-12-2023锛 + - 鍗囩骇鍒發inuxserver/docker-emby鏈鏂扮増 -## 4.8.0.64 (30-12-2023) +### 4.8.0.64锛30-12-2023锛 + - 鍗囩骇鍒發inuxserver/docker-emby鏈鏂扮増 -## 4.8.0.63 (23-12-2023) +### 4.8.0.63锛23-12-2023锛 + - 鍗囩骇鍒發inuxserver/docker-emby鏈鏂扮増 -## 4.8.0.62 (16-12-2023) +### 4.8.0.62锛16-12-2023锛 + - 棣栨鎻愪氦 diff --git a/emby/DOCS.md b/emby/DOCS.md index dbf54bc..b2859c8 100644 --- a/emby/DOCS.md +++ b/emby/DOCS.md @@ -1,3 +1,19 @@ # Emby NAS -Emby Server鏄竴娆句釜浜哄獟浣撴湇鍔″櫒锛屽嚑涔庡湪鎵鏈夎澶囦笂閮芥湁搴旂敤绋嬪簭銆 \ No newline at end of file +## 浣跨敤鏂规硶 + +- 鍚姩鍚庡彲鍦ㄤ俊鎭〉涓偣鍑"鎵撳紑 WEI UI"锛屼篃鍙氳繃娴忚鍣ㄨ闂 锛堢鍙ｅ彿榛樿8096锛. + +- 棣栨杩涘叆鍚庨夋嫨璇█鈥淐hinese Simplified鈥濓紝鐐瑰嚮涓嬩竴姝ャ + +- 杈撳叆璐﹀彿鍙婂瘑鐮侊紝鐐瑰嚮涓嬩竴姝ャ + +- 璁剧疆濯掍綋搴撳彲涓嶈缃紝鐐瑰嚮涓嬩竴姝ャ + +- 棣栭夋簮鏁版嵁璇█鎸夐渶瑕侀厤缃紝鐐瑰嚮涓嬩竴姝ャ + +- 閰嶇疆杩滅▼璁块棶榛樿锛岀偣鍑讳笅涓姝ャ + +- 浣跨敤璁稿彲鐐瑰嚮鈥滄垜鎺ュ彈鏈嶅姟鏉℃鈥濓紝鐐瑰嚮涓嬩竴姝ャ + +- 瀹屾垚棣栨閰嶇疆銆 \ No newline at end of file diff --git a/emby/README.md b/emby/README.md index 5943c8d..df3796d 100644 --- a/emby/README.md +++ b/emby/README.md @@ -1,4 +1,4 @@ -# 鍐摐鐢勯塧ddons: emby +# 鍐摐鐢勯塧ddons锛歟mby ## 鍏充簬 diff --git a/emby/config.json b/emby/config.json index 2b7301a..96340c3 100644 --- a/emby/config.json +++ b/emby/config.json @@ -1,8 +1,7 @@ { "arch": [ "aarch64", - "amd64", - "armv7" + "amd64" ], "backup_exclude": [ "*/cache/", diff --git a/filebrowser/DOCS.md b/filebrowser/DOCS.md index 40cb5c4..b81d7dc 100644 --- a/filebrowser/DOCS.md +++ b/filebrowser/DOCS.md @@ -1,58 +1,55 @@ # Filebrowser -> 涓涓潪甯稿ソ鐢ㄧ殑锛屽熀浜嶹eb绠＄悊鐨勬枃浠剁鐞嗗櫒銆 -> -> - ## 閰嶇疆璇存槑 - ### 鏃犺璇佽繍琛屾ā寮: -      鍚敤/鍋滅敤ssl銆 + +- 鍚敤/鍋滅敤ssl銆 ### 鍒濆鏂囦欢澶: -      鍙夐」锛岄粯璁ゅ /銆 + +- 鍙夐」锛岄粯璁ゅ /銆 ### 璇佷功鏂囦欢: -       ssl璇佷功鏂囦欢銆 + +- ssl璇佷功鏂囦欢銆 ### cifs鍩燂細 -       cifs鍩熴 - +- cifs鍩熴 ### cifs鐢ㄦ埛鍚嶏細 -      鍙夐」锛宻mb鐢ㄦ埛鍚嶏紝涓巗mb shares鐢ㄦ埛鍚嶇浉鍚屻 + +- 鍙夐」锛宻mb鐢ㄦ埛鍚嶏紝涓巗mb shares鐢ㄦ埛鍚嶇浉鍚屻 ### cifs瀵嗙爜锛 -       鍙夐」锛宻mb瀵嗙爜锛屼笌smb shares瀵嗙爜鐩稿悓銆 +- 鍙夐」锛宻mb瀵嗙爜锛屼笌smb shares瀵嗙爜鐩稿悓銆 ### 瀵嗛挜锛 -       sl瀵嗛挜銆 +- sl瀵嗛挜銆 ### 鏈湴纾佺洏锛 -       鐢ㄩ楀彿鍒嗛殧瑕佹寕杞界殑椹卞姩鍣ㄧ殑纭欢鍚嶇О鎴栧叾鏍囩銆備緥濡俿da1, sdb1, MYNAS绛夈 + +- 鐢ㄩ楀彿鍒嗛殧瑕佹寕杞界殑椹卞姩鍣ㄧ殑纭欢鍚嶇О鎴栧叾鏍囩銆備緥濡俿da1, sdb1, MYNAS绛夈 ### 缃戠粶纾佺洏锛 -      鍙夛紝瑕佹寕杞界殑smbv2/3鏈嶅姟鍣ㄥ垪琛紝浠ラ楀彿鍒嗛殧銆 +- 鍙夛紝瑕佹寕杞界殑smbv2/3鏈嶅姟鍣ㄥ垪琛紝浠ラ楀彿鍒嗛殧銆 ### 绂佺敤缂╃暐鍥撅細 -     True /false(璁剧疆绂佺敤缂╃暐鍥句负True鎴杅alse;閫熷害榛樿涓簍rue)銆 +- True /false(璁剧疆绂佺敤缂╃暐鍥句负True鎴杅alse;閫熷害榛樿涓簍rue)銆 ### ssl锛 -       鍚敤/绂佺敤ssl銆 +- 鍚敤/绂佺敤ssl銆 +## 浣跨敤鏂规硶 +- 鍙互閫氳繃娴忚鍣ㄩ〉闈㈣闂 锛堢鍙ｅ彿榛樿8080锛 +- 榛樿鐢ㄦ埛鍚: "admin" 瀵嗙爜: "admin" - -鍙互閫氳繃娴忚鍣ㄩ〉闈㈣闂 锛堢鍙ｅ彿榛樿8080锛 - -榛樿鐢ㄦ埛鍚: "admin" 瀵嗙爜: "admin" - -缃戠粶纾佺洏鎸傝浇鍒 `/share/storagecifs`涓嬨 +- 缃戠粶纾佺洏鎸傝浇鍒 `/share/storagecifs`涓嬨 \ No newline at end of file diff --git a/filebrowser/README.md b/filebrowser/README.md index 2e0da5d..3c96cc2 100644 --- a/filebrowser/README.md +++ b/filebrowser/README.md @@ -1,15 +1,9 @@ -# 鍐摐鐢勯塧ddons: Filebrowser - - +# 鍐摐鐢勯塧ddons锛欶ilebrowser ## 鍏充簬 涓涓潪甯稿ソ鐢ㄧ殑锛屽熀浜嶹eb绠＄悊鐨刐鏂囦欢绠＄悊鍣 File Browser](https://filebrowser.org/). - - ## 鏉ユ簮 https://github.com/alexbelgium/hassio-addons - - diff --git a/haos_turbo/CHANGELOG.md b/haos_turbo/CHANGELOG.md index 4e582d7..69d7c1d 100644 --- a/haos_turbo/CHANGELOG.md +++ b/haos_turbo/CHANGELOG.md @@ -1,7 +1,7 @@ -## 2.2.4.6-3(15-1-2024) +### 2.2.4.6-3锛2024-1-15锛 - 澧炲姞浜咲NS妯″紡閫夐」锛屽彲浠ュ緢濂界殑閫傞厤绉诲姩瀹藉甫 -## 2.2.4.6(5-1-2024) +### 2.2.4.6锛2024-1-15锛 - 棣栨鎻愪氦 diff --git a/haos_turbo/DOCS.md b/haos_turbo/DOCS.md index b6e6163..f85e8c4 100644 --- a/haos_turbo/DOCS.md +++ b/haos_turbo/DOCS.md @@ -1,44 +1,40 @@ # Haos Turbo -鏈塛eb GUI鍗囬熷櫒瀹㈡埛绔 - - - ## 閰嶇疆璇存槑 ### 浣跨敤鍚庡彴鏈嶅姟: -      閫夋嫨鍚庡彴鏈嶅姟鐨勫唴鏍哥被鍨 +- 閫夋嫨鍚庡彴鏈嶅姟鐨勫唴鏍哥被鍨 ### 閰嶇疆鐗堟湰: -      浣跨敤閰嶇疆鏂囦欢鐨勭増鏈. 鐩墠v1鐨勫吋瀹规ц緝濂姐 +- 浣跨敤閰嶇疆鏂囦欢鐨勭増鏈. 鐩墠v1鐨勫吋瀹规ц緝濂姐 ### 鍗囬熷煙鍚: -      (閫夐」)鍗囬熺殑鍩熷悕鍒楄〃銆 +- (閫夐」)鍗囬熺殑鍩熷悕鍒楄〃銆 ### 鐩磋繛鍩熷悕锛 -      (閫夐」)鐩磋繛鐨勫煙鍚嶅垪琛ㄣ +- (閫夐」)鐩磋繛鐨勫煙鍚嶅垪琛ㄣ ### 鍗囬烮P(CIDR)锛 -      (閫夐」)鍗囬熺殑IP鍦板潃(鏀寔CIDR)銆 +- (閫夐」)鍗囬熺殑IP鍦板潃(鏀寔CIDR)銆 ### 鐩磋繛IP(CIDR)锛 -      (閫夐」)鐩磋繛鐨処P鍦板潃(鏀寔CIDR)銆 +- (閫夐」)鐩磋繛鐨処P鍦板潃(鏀寔CIDR)銆 ### 鍏抽棴閮ㄥ垎鏃ュ織锛 -      鍏抽棴閮ㄥ垎鏃ュ織锛堟敞鎰忥細璋冭瘯鏃舵墠寮锛屽惁鍒欐棩蹇椾細鍗犵敤纾佺洏绌洪棿锛 +- 鍏抽棴閮ㄥ垎鏃ュ織锛堟敞鎰忥細璋冭瘯鏃舵墠寮锛屽惁鍒欐棩蹇椾細鍗犵敤纾佺洏绌洪棿锛 ### 娓呴櫎鐢ㄦ埛鏁版嵁锛 -       姣忔鍚姩鑷姩娓呴櫎鎵鏈夌殑鐢ㄦ埛鏁版嵁锛堟敞鎰忥細鍗歌浇鎻掍欢锛岀敤鎴锋暟鎹笉浼氬垹闄わ級 +- 姣忔鍚姩鑷姩娓呴櫎鎵鏈夌殑鐢ㄦ埛鏁版嵁锛堟敞鎰忥細鍗歌浇鎻掍欢锛岀敤鎴锋暟鎹笉浼氬垹闄わ級 ### DNS瑙ｆ瀽妯″紡锛 -       杩欓噷璁剧疆DNS瑙ｆ瀽妯″紡銆 +- 杩欓噷璁剧疆DNS瑙ｆ瀽妯″紡銆 diff --git a/haos_turbo/README.md b/haos_turbo/README.md index 3345ec3..7a5008b 100644 --- a/haos_turbo/README.md +++ b/haos_turbo/README.md @@ -1,17 +1,15 @@ -# 鍐摐鐢勯塧ddons: Haos鍗囬熷櫒 - - - -瓒呯骇鐨凥ome Assistant addons锛屾湁寰堝ソ鐨勪笅杞芥彁閫熷姛鐢ㄣ傞櫎浜嗚兘瀵笻A鍔犻熷锛岃繕鍙互鎻愪緵缃戦〉璁块棶浠 - -鐞嗗姛鑳姐傜敤杩囩殑閮借濂姐 +# 鍐摐鐢勯塧ddons锛欻aos鍗囬熷櫒 +## 鍏充簬 +瓒呯骇Home Assistant addons锛屾湁寰堝ソ鐨勪笅杞芥彁閫熷姛鐢ㄣ傞櫎浜嗚兘瀵笻A鍔犻熷锛岃繕鍙互鎻愪緵缃戦〉璁块棶浠ｇ悊鍔熻兘銆傜敤杩囩殑閮借濂姐 **浣跨敤娉ㄦ剰锛佷娇鐢ㄧ枒闅鹃棶绛** * 瀹樻柟鍘熺増haos鐨勭郴缁燂紝浠呮敮鎸乤md64(x86_64)绯诲垪 + * 鍐摐鐗堟湰鐨刪aos绯诲垪锛岄兘鏀寔銆 + * 鍘熺増aarch64鍐呮牳鐨勬湁浜涘姛鑳戒笉瀹屾暣锛屾湁鏃犳硶浣跨敤鐨勬儏鍐点 * 姝ddon鎻掍欢鍙兘鍦℉A鍚姩鍚庯紝鏈嶅姟鍚姩閰嶇疆瀹屾垚涔嬪悗鎵嶆湁鏁堬紝鍥犳涓嶈兘瀵归娆″畨瑁呮湁鍗囬熶綔鐢ㄣ @@ -20,16 +18,24 @@ * 鐢变簬鍏ㄥ浗鍚勫湴鏈湴ISP缃戠粶鐨勪笉涓鏍凤紝鐗瑰畾鍦板尯鏈夊彲鑳戒笉鑳戒娇鐢 - - ### 棣栨閰嶇疆鍜屼娇鐢 * 榛樿閫夎鍔犻熷櫒(鍙互閫夋嫨澶氱粍璐熻浇鍧囪　) + * 鍚姩璇ュ崌閫熷櫒鏈嶅姟鍚(浠 鐞嗘湇鍔℃湭鍚姩) - * 杩涘叆 http://:2017 - * 娉ㄥ唽 鐢ㄦ埛鍚嶅瘑鐮 骞惰鐗 - * 杩涘叆"璁剧疆" - * 鍏抽棴"寮鍚疘P杞彂"锛屾墦寮"寮鏈虹鍙ｅ垎浜" - * 宸︿笂瑙掑惎鍔ㄦ湇鍔 + + * 杩涘叆 http://:2017 + + * 娉ㄥ唽 鐢ㄦ埛鍚嶅瘑鐮 骞惰鐗 + + * 杩涘叆"璁剧疆" + + * 鍏抽棴"寮鍚疘P杞彂"锛屾墦寮"寮鏈虹鍙ｅ垎浜" + + * 宸︿笂瑙掑惎鍔ㄦ湇鍔 鏇村鍔熻兘浣跨敤锛岃鍙﹁涓婄綉鎼滅储 + +## 鏉ユ簮 + +涓嶈 \ No newline at end of file diff --git a/imaotai/CHANGELOG.md b/imaotai/CHANGELOG.md new file mode 100644 index 0000000..9300cf0 --- /dev/null +++ b/imaotai/CHANGELOG.md @@ -0,0 +1,3 @@ +### 1.0.12锛2024-01-18锛 + +- 棣栨鎺ㄥ嚭 \ No newline at end of file diff --git a/imaotai/DOCS.md b/imaotai/DOCS.md new file mode 100644 index 0000000..aed9dd2 --- /dev/null +++ b/imaotai/DOCS.md @@ -0,0 +1,38 @@ +# imaotai + +## 閰嶇疆璇存槑 + +### 涓銆佸畨瑁呭強閰嶇疆 鏁版嵁搴 + +- 杩涘叆閰嶇疆 - 鍔犺浇椤瑰晢搴 鎵惧埌骞跺畨瑁 Official add-ons涓壘鍒癕ariaDB銆 + +- 瀹夎瀹屾垚鍚庣偣鍑婚厤缃紝鍦ㄩ夐」涓壘鍒扳淒atabases鈥濋夐」骞惰緭鍏モ渃ampus_imaotai鈥濄 + +- 鍦↙ogins閫夐」鍐呯殑鈥- password鈥濆杈撳叆 鏁版嵁搴撶殑鑷畾涔夊瘑鐮併 + +``` +- password:WaxGourdHAos +``` + +- 鍦≧ights閫夐」鍐呮渶涓嬮潰鍥炶溅**鏂板缓涓琛**杈撳叆 锛 +``` +- database: campus_imaotai + username: homeassistant +``` +- 鐐瑰嚮淇濆瓨骞跺惎鍔∕ariaDB + +### 浜屻佸畨瑁呭強閰嶇疆 i鑼呭彴 + +- 杩涘叆閰嶇疆 - 鍔犺浇椤瑰晢搴 鎵惧埌骞跺畨瑁 i鑼呭彴銆 + +- 瀹夎瀹屾垚鍚庣偣鍑婚厤缃紝鍦ㄩ夐」涓壘鍒''db_pass*"澶勮緭鍏 鏁版嵁搴撶殑鑷畾涔夊瘑鐮併 + +- 鐐瑰嚮淇濆瓨骞跺惎鍔 i鑼呭彴 + +- 鍦ㄦ棩蹇楀鐐瑰嚮鍒锋柊鐩磋嚦鍑虹幇鈥滄帴鍙ｆ湇鍔¤繍琛屾垚鍔.鈥濆瓧鏍峰緱绯荤粺鍚姩鎴愬姛銆傦紙娉ㄦ剰锛氳椤圭洰浣跨敤java寮鍙戯紝鍚姩鎱㈠拰杩愯鍗犵敤鍐呭瓨杈冨锛 + +- 鍥炲埌淇℃伅椤典腑鐐瑰嚮鈥滄墦寮 WEB UI鈥濊繘鍏ュ钩鍙帮紝鐧诲綍鍗冲彲鎿嶄綔銆 + + + +骞冲彴閰嶇疆璇锋煡鐪嬪畼鏂规暀绋嬶細[鏁欑▼缃戝潃](https://oddfar.github.io/campus-doc/campus-imaotai/#%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B) diff --git a/imaotai/README.md b/imaotai/README.md new file mode 100644 index 0000000..e9a9e0f --- /dev/null +++ b/imaotai/README.md @@ -0,0 +1,9 @@ +# 鍐摐鐢勯塧ddons锛歩鑼呭彴 + +## 鍏充簬 + +i鑼呭彴app鑷姩棰勭害锛屾瘡鏃ヨ嚜鍔ㄩ绾︼紝鏀寔docker涓閿儴缃 + +## 鏉ユ簮 + +https://github.com/oddfar/campus-imaotai \ No newline at end of file diff --git a/imaotai/config.yaml b/imaotai/config.yaml new file mode 100644 index 0000000..6eb38c3 --- /dev/null +++ b/imaotai/config.yaml @@ -0,0 +1,20 @@ +name: i鑼呭彴 +version: 1.0.12 +slug: imaotai +codenotary: wghaos@163.com +description: 'i鑼呭彴app鑷姩棰勭害锛屾瘡鏃ヨ嚜鍔ㄩ绾︼紝鏀寔docker涓閿儴缃' +url: https://gitcode.com/waxgourd/addons +image: wghaos/imaotai +init: false +arch: + - aarch64 + - amd64 +webui: "[PROTO:http]://[HOST]:[PORT:8161]" +ports: + 8161/tcp: 8161 +options: + db_user: homeassistant + db_pass: null +schema: + db_user: str + db_pass: str diff --git a/imaotai/icon.png b/imaotai/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3c27e5a3fbe7dd98d446046737be9368fdb6bd01 GIT binary patch literal 20788 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 [Mi Body Composition Scale 2](https://c.mi.com/thread-2289389-1-0.html) | XMTZC05HM | Mi Body Composition Scale 2 -鎬ョ潃鍑猴紝姹夊寲鍚庣画璋冩暣锛侊紒锛侊紙鍐摐澶囨敞锛 - -# Setup - -1. Retrieve the scale's MAC address from the [Xiaomi Mi Fit app](https://play.google.com/store/apps/details?id=com.xiaomi.hm.health&hl=en&gl=US), or alternatively, you can also use the `bluetoothctl` tool on Linux and type `scan on` to scan for BLE devices (`sudo hcitool lescan` might also work). The device should be named `MIBFS` or similar.
-Showing the MAC address in the Xiaomi Mi Fit app - - -1. Open Home Assistant and navigate to the "Add-on Store". Click on the 3 dots (top right) and select "Repositories". -2. Enter `https://github.com/lolouk44/hassio-addons` in the box and click on "Add". -3. You should now see "Lolouk44 Add-Ons" at the bottom list. -4. Click on "Xiaomi Mi Scale", then click "Install". -5. Under the "Configuration" tab, change the settings appropriately (at least MQTT parameters, user properties, and MAC address), see [Parameters](#parameters). -6. Start the Add-on. - -## Important: -If using the Add-On outside of Home Assistant Operating System / through a docker container, make sure the dbus is shared with the container running Home Assistant. This is typically done by adding the following line in your docker run command: -`-v /var/run/dbus/:/var/run/dbus/:ro` -or the following lines in your docker-compose file: -``` - volumes: - - /var/run/dbus/:/var/run/dbus/:ro -``` - -## Parameters -Option | Type | Required | Description +## 閰嶇疆璇存槑 +閰嶇疆椤 | 绫诲瀷 | 蹇呭～椤 | 璇存槑 --- | --- | --- | --- -HCI_DEV | string | No | Bluetooth hci device to use. Defaults to `hci0` -BLUEPY_PASSIVE_SCAN | bool | No | Try to set to true if getting an error like `Bluetooth connection error: Failed to execute management command 鈥榣e on鈥檂 on a Raspberry Pi. Defaults to `false` -MISCALE_MAC | string | Yes | MAC address of your scale -MQTT_PREFIX | string | No | MQTT topic prefix, defaults to `miscale` -MQTT_HOST | string | Yes | MQTT server, defaults to `127.0.0.1` -MQTT_USERNAME | string | No | Username for MQTT server (comment out if not required) -MQTT_PASSWORD | string | No | Password for MQTT (comment out if not required) -MQTT_PORT | int | No | Port of your MQTT server, defaults to 1883 -MQTT_DISCOVERY | bool | No | Whether you want MQTT discovery for Home Assistant, defaults to `true` -MQTT_DISCOVERY_PREFIX | string | No | MQTT discovery prefix for Home Assistant, defaults to `homeassistant` -DEBUG_LEVEL | string | No | Logging level. Possible values: 'CRITICAL', 'ERROR', 'WARNING', 'INFO', 'DEBUG'. Defaults to 'INFO' -USERS | List | Yes | List of users to add, see below +HCI_DEV | string | 鍚 | 钃濈墮鍦板潃銆傞粯璁や负 `hci0` +BLUEPY_PASSIVE_SCAN | bool | 鍚 | 濡傛灉鍍忓湪 Raspberry Pi 涓婂嚭鐜伴敊璇 `Bluetooth connection error: Failed to execute management command 鈥榣e on鈥檂 锛岃灏濊瘯璁剧疆涓 true銆傞粯璁や负 `false` +MISCALE_MAC | string | 鏄 | 绉ょ殑 MAC 鍦板潃 +MQTT_PREFIX | string | 鍚 | MQTT 涓婚鍓嶇紑锛岄粯璁や负`miscale` +MQTT_HOST | string | 鏄 | MQTT 鏈嶅姟鍣紝榛樿涓篳127.0.0.1` +MQTT_USERNAME | string | 鍚 | MQTT 鏈嶅姟鍣ㄧ殑鐢ㄦ埛鍚嶏紙濡傛灉涓嶉渶瑕侊紝鍒欐敞閲婃帀锛 +MQTT_PASSWORD | string | 鍚 | MQTT 鏈嶅姟鍣ㄧ殑瀵嗙爜锛堝鏋滀笉闇瑕侊紝鍒欐敞閲婃帀锛 +MQTT_PORT | int | 鍚 | MQTT 鏈嶅姟鍣ㄧ殑绔彛锛岄粯璁や负 1883 +MQTT_DISCOVERY | bool | 鍚 | 鏄惁瑕 Home Assistant 鐨 MQTT 鍙戠幇锛岄粯璁や负 `true` +MQTT_DISCOVERY_PREFIX | string | 鍚 | Home Assistant 鐨 MQTT 鍙戠幇鍓嶇紑锛岄粯璁や负 `homeassistant` +DEBUG_LEVEL | string | 鍚 | 鏃ュ織璁板綍绾у埆銆傚彲鑳界殑鍊硷細`CRITICAL`銆乣ERROR`銆乣WARNING`銆乣INFO`銆乣DEBUG`锛岄粯璁や负`INFO` +USERS | List | 鏄 | 瑕佹坊鍔犵殑鐢ㄦ埛鍒楄〃锛岃鍙傝涓嬫枃 -Auto-gender selection/config: this is used to create the calculations such as BMI, Water/Bone Mass, etc. -Here is the logic used to assign a measured weight to a user: -- If the weight is within the range of a user's defined values for GT and LT, then it will be assigned (published) to that user. -- If the weight matches two separate user ranges, it will only be assigned to the first user that matched. So don't create overlapping ranges! +鑷姩鎬у埆閫夋嫨/閰嶇疆锛氱敤浜庡垱寤鸿绠楋紝渚嬪 BMI銆佹按/楠ㄩ噺绛夈備互涓嬫槸鐢ㄤ簬涓虹敤鎴峰垎閰嶆祴閲忔潈閲嶇殑閫昏緫锛 +- 濡傛灉鏉冮噸鍦ㄧ敤鎴峰畾涔夌殑 GT 鍜 LT 鍊艰寖鍥村唴锛屽垯浼氬皢鍏跺垎閰嶏紙鍙戝竷锛夌粰璇ョ敤鎴枫 +- 濡傛灉鏉冮噸涓庝袱涓崟鐙殑鐢ㄦ埛鑼冨洿鍖归厤锛屽垯鍙細灏嗗叾鍒嗛厤缁欏尮閰嶇殑绗竴涓敤鎴枫傛墍浠ヤ笉瑕佸垱寤洪噸鍙犵殑鑼冨洿锛 -User Option | Type | Required | Description +鐢ㄦ埛閫夐」 | 绫诲瀷 | 蹇呭～椤 | 璇存槑 --- | --- | --- | --- -GT | int | Yes | Greater Than - Weight must be greater than this value; this will be the lower limit for the weight range of the user -LT | int | Yes | Less Than - Weight must be less than this value; this will be the upper limit for the weight range of the user -SEX | string | Yes | Gender of the user (male / female) -NAME | string | Yes | Name of the user -HEIGHT | int | Yes | Height (in cm) of the user -DOB | string | Yes | Date of Birth of the user (in yyyy-mm-dd format) +GT | int | 鏄 | 澶т簬 - 鏉冮噸蹇呴』澶т簬姝ゅ;杩欏皢鏄敤鎴蜂綋閲嶈寖鍥寸殑涓嬮檺 +LT | int | 鏄 | 灏忎簬 - 閲嶉噺蹇呴』灏忎簬姝ゅ;杩欏皢鏄敤鎴蜂綋閲嶈寖鍥寸殑涓婇檺 +SEX | string | 鏄 | 鐢ㄦ埛鐨勬у埆锛堢敺/濂筹級 +NAME | string | 鏄 | 鐢ㄦ埛鍚嶇О +HEIGHT | int | 鏄 | 鐢ㄦ埛鐨勮韩楂橈紙鍘樼背锛 +DOB | string | 鏄 | 鐢ㄦ埛鐨勫嚭鐢熸棩鏈燂紙鏍煎紡 yyyy-mm-dd 锛 -Note: the weight definitions must be in the same unit as the scale (kg, Lbs, or jin). +娉ㄦ剰锛氶噸閲忓畾涔夊繀椤讳笌浣撻噸绉ょ殑鍗曚綅鐩稿悓锛坘g銆丩bs 鎴 jin锛夈 -# Home Assistant Setup -In the `mqtt:` block, enter as many blocks as users configured in your environment variables. -If you already have an `mqtt:` and/or `sensor:` block, do not create another one but simply add the "missing" bits under the relevant block header. -Note: Only weight entities are automatically added via the MQTT discovery. +## configuration.yaml閰嶇疆 +鍦ㄥ潡涓 `mqtt:` 锛岃緭鍏ヤ笌鐜鍙橀噺涓厤缃殑鐢ㄦ埛鏁颁竴鏍峰鐨勫潡銆傚鏋滄偍宸茬粡鏈変竴涓 `mqtt:` and/or `sensor:` 鍧楋紝璇蜂笉瑕佸垱寤哄彟涓涓潡锛岃屽彧闇鍦ㄧ浉鍏冲潡澶翠笅娣诲姞鈥滅己澶扁濅綅銆傛敞鎰忥細鍙湁鏉冮噸瀹炰綋鎵嶄細閫氳繃 MQTT 鍙戠幇鑷姩娣诲姞銆 ```yaml @@ -92,9 +67,6 @@ mqtt: state_class: "measurement" ``` -Example of the Lovelace card in HA 馃牪 Example of the details of the Lovelace card in HA +Example of the Lovelace card in HA - - -# Acknowledgements -Thanks to @syssi (https://gist.github.com/syssi/4108a54877406dc231d95514e538bde9) and @prototux (https://github.com/wiecosystem/Bluetooth) for their initial code. Special thanks to [@ned-kelly](https://github.com/ned-kelly) for his help turning a "simple" Python script into a fully fledged Docker container. Thanks to [@bpaulin](https://github.com/bpaulin), [@fabir-git](https://github.com/fabir-git), [@snozzley](https://github.com/snozzley), [CodeFinder2](https://github.com/CodeFinder2) [@MariusHerget](https://github.com/MariusHerget) for their PRs and collaboration. +Example of the details of the Lovelace card in HA \ No newline at end of file diff --git a/mi-scale/README.md b/mi-scale/README.md index 8a12d16..c41d03c 100644 --- a/mi-scale/README.md +++ b/mi-scale/README.md @@ -1,4 +1,4 @@ -# 鍐摐鐢勯塧ddons: 灏忕背浣撹剛绉 +# 鍐摐鐢勯塧ddons锛氬皬绫充綋鑴傜О ## 鍏充簬 diff --git a/mpd/CHANGELOG.md b/mpd/CHANGELOG.md index 1992c99..22a4ae5 100644 --- a/mpd/CHANGELOG.md +++ b/mpd/CHANGELOG.md @@ -1,3 +1,3 @@ -## 1.7.2 - 2022-08-17 +### 1.7.2锛2023-12-29锛 -* 棣栨鎺ㄥ嚭 +- 棣栨鎺ㄥ嚭 \ No newline at end of file diff --git a/mpd/DOCS.md b/mpd/DOCS.md index 6c15805..f10ce4a 100644 --- a/mpd/DOCS.md +++ b/mpd/DOCS.md @@ -1,6 +1,8 @@ -# 閰嶇疆椤硅鏄庯細 +# MPD -涓嬮潰鏄彃浠朵綔鑰呯殑寤鸿锛 +## 閰嶇疆璇存槑锛 + +- 涓嬮潰鏄彃浠朵綔鑰呯殑寤鸿锛 ```yaml media_folder: /media/mpd/media @@ -11,46 +13,49 @@ httpd_output: false ### 闊抽噺鏍囧噯鍖 -鍚敤鍐呯疆鐨勯煶閲忔爣鍑嗗寲鍔熻兘銆 +- 鍚敤鍐呯疆鐨勯煶閲忔爣鍑嗗寲鍔熻兘銆 ### httpd杈撳嚭 -鍚敤 httpd 闊抽杈撳嚭銆 +- 鍚敤 httpd 闊抽杈撳嚭銆 ### 濯掍綋鏂囦欢澶 -姝ら夐」鍏佽浣犳寚瀹氳嚜瀹氫箟濯掍綋鏂囦欢澶广 +- 姝ら夐」鍏佽浣犳寚瀹氳嚜瀹氫箟濯掍綋鏂囦欢澶广 ### 鎾斁鍒楄〃鏂囦欢澶 -姝ら夐」鍏佽浣犳寚瀹氳嚜瀹氫箟鎾斁鍒楄〃鏂囦欢澶广 +- 姝ら夐」鍏佽浣犳寚瀹氳嚜瀹氫箟鎾斁鍒楄〃鏂囦欢澶广 ### 璇︾粏 (鍙夐」) -`MPD` 璇︾粏鏃ュ織鍙傛暟銆 - +- `MPD` 璇︾粏鏃ュ織鍙傛暟銆 ### 鑷畾涔夐厤缃 (鍙夐」) **濡傛灉鎸囧畾姝ら夐」锛屽垯蹇界暐鎵鏈夊叾浠栭夐」銆** -姝ら夐」鍏佽浣犱负 MPD 鎸囧畾鑷畾涔夐厤缃枃浠躲 -涓轰簡灏嗘墍鏈 MPD 鏂囦欢淇濆瓨鍦ㄤ竴涓綅缃紝宸卞皢璺緞鍓嶇紑闄愬埗涓衡/share/MPD 鈥濄 -璇蜂娇鐢ㄦ彃浠剁殑榛樿 [MPD.conf](https://github.com/poeschl/hassio-addons/blob/main/mpd/root/etc/mpd.conf )浣滀负鍙傝冦 -濡傛灉浣犵殑閰嶇疆鏈夐棶棰橈紝璇锋煡闃呭畼鏂规枃妗MPD Docs](https://www.musicpd.org/doc/html/user.html#configuration)锛屾壘瑙ｅ喅鏂规硶銆 +- 姝ら夐」鍏佽浣犱负 MPD 鎸囧畾鑷畾涔夐厤缃枃浠躲 +- 涓轰簡灏嗘墍鏈 MPD 鏂囦欢淇濆瓨鍦ㄤ竴涓綅缃紝宸卞皢璺緞鍓嶇紑闄愬埗涓衡/share/MPD 鈥濄 +- 璇蜂娇鐢ㄦ彃浠剁殑榛樿 [MPD.conf](https://github.com/poeschl/hassio-addons/blob/main/mpd/root/etc/mpd.conf )浣滀负鍙傝冦 +- 濡傛灉浣犵殑閰嶇疆鏈夐棶棰橈紝璇锋煡闃呭畼鏂规枃妗MPD Docs](https://www.musicpd.org/doc/html/user.html#configuration)锛屾壘瑙ｅ喅鏂规硶銆 -# 鏁呴殰鎺掗櫎 +## 鏁呴殰鎺掗櫎 -### `RTIOThread could not get realtime scheduling, continuing anyway: sched_setscheduler` +``` +RTIOThread could not get realtime scheduling, continuing anyway: sched_setscheduler +``` -姝ら敊璇樉绀哄湪浠讳綍闈 glibc 绯荤粺锛堝 Alpine Linux锛変笂銆侻PD 搴旇鍦ㄦ病鏈夊畠鐨勬儏鍐典笅宸ヤ綔銆 +A锛氭閿欒鏄剧ず鍦ㄤ换浣曢潪 glibc 绯荤粺锛堝 Alpine Linux锛変笂銆侻PD 搴旇鍦ㄦ病鏈夊畠鐨勬儏鍐典笅宸ヤ綔銆 鏇村璇风湅杩欓噷锛 [MPD Issue](https://github.com/MusicPlayerDaemon/MPD/issues/218) -### `Failed to open '/data/database/mpd.db': No such file or directory` +``` +Failed to open '/data/database/mpd.db': No such file or directory +``` -褰撴暟鎹簱涓嶅瓨鍦ㄦ椂锛屾閿欒鍦ㄧ涓娆″惎鍔ㄦ椂鏄剧ず銆傚畠灏嗗湪绗簩娆¤繍琛屾椂鍑虹幇銆 +A锛氬綋鏁版嵁搴撲笉瀛樺湪鏃讹紝姝ら敊璇湪绗竴娆″惎鍔ㄦ椂鏄剧ず銆傚畠灏嗗湪绗簩娆¤繍琛屾椂鍑虹幇銆 -# MPD +## 浣滆呮彁閱 瑕佷粠HA杩炴帴锛岃浣跨敤浠ヤ笅閰嶇疆锛 diff --git a/mpd/README.md b/mpd/README.md index 7e786f0..d9afc30 100644 --- a/mpd/README.md +++ b/mpd/README.md @@ -1,11 +1,9 @@ -# 鍐摐鐢勯塧ddons: MPD +# 鍐摐鐢勯塧ddons锛歁PD ## 鍏充簬 [MPD](https://www.musicpd.org)鏄竴娆惧厤璐圭殑寮婧愰煶涔愭挱鏀惧櫒銆傚畠鍙互鎾斁闊抽鏂囦欢銆佺粍缁囨挱鏀惧垪琛ㄥ苟缁存姢闊充箰鏁版嵁搴撱傛湰鎻掍欢涓寘鍚湁绠鏄撶殑WEB鍓嶇[YMPD](https://ympd.org/)銆 - - ## 鏉ユ簮 https://github.com/Poeschl/Hassio-Addons/tree/main/mpd diff --git a/nextcloud/CHANGELOG.md b/nextcloud/CHANGELOG.md index c29b5b0..fb316e0 100644 --- a/nextcloud/CHANGELOG.md +++ b/nextcloud/CHANGELOG.md @@ -1,20 +1,31 @@ -### 28.0.1-6 (14-01-2024) +### 28.0.1-6锛14-01-2024锛 + - 淇浜嗕竴浜涘皬bug -### 28.0.1-5 (14-01-2024) + +### 28.0.1-5锛14-01-2024锛 + - 淇浜嗕竴浜涘皬bug -### 28.0.1-4 (12-01-2024) + +### 28.0.1-4锛12-01-2024锛 + - 淇 : https://github.com/alexbelgium/hassio-addons/issues/1170 https://github.com/alexbelgium/hassio-addons/issues/1171 -### 28.0.1-3 (10-01-2024) +### 28.0.1-3锛10-01-2024锛 + - 鍒濇淇 : https://github.com/alexbelgium/hassio-addons/issues/1170 -### 28.0.1-2 (07-01-2024) +### 28.0.1-2锛07-01-2024锛 + - 鍗囩骇鏈鍚庣殑鐗堟湰浠巐inuxserver/docker-nextcloud -## 28.0.1 (30-12-2023) +### 28.0.1锛30-12-2023锛 + - 鍗囩骇鏈鍚庣殑鐗堟湰浠巐inuxserver/docker-nextcloud -## 28.0.0 (16-12-2023) +### 28.0.0锛16-12-2023锛 + - 鍗囩骇鏈鍚庣殑鐗堟湰浠巐inuxserver/docker-nextcloud -### 27.1.4-6 (07-12-2023) + +### 27.1.4-6锛07-12-2023锛 + - 棣栨鎻愪氦 diff --git a/nextcloud/DOCS.md b/nextcloud/DOCS.md index 10d245c..f88c17b 100644 --- a/nextcloud/DOCS.md +++ b/nextcloud/DOCS.md @@ -4,92 +4,90 @@ ### 鍏ㄦ枃绱㈠紩 - - ### OCR -璁剧疆涓簍rue浠ュ畨瑁卼esseract-ocr鍔熻兘銆 +- 璁剧疆涓簍rue浠ュ畨瑁卼esseract-ocr鍔熻兘銆 ### OCR璇█ -浠讳綍璇█閮藉彲浠ヤ粠杩欎釜椤甸潰璁剧疆(鎬绘槸涓変釜瀛楁瘝) [鏌ヨ鐐瑰嚮杩欓噷](https://tesseract-ocr.github.io/tessdoc/Data-Files#data-files-for-version-400-november-29-2016) +- 浠讳綍璇█閮藉彲浠ヤ粠杩欎釜椤甸潰璁剧疆(鎬绘槸涓変釜瀛楁瘝) [鏌ヨ鐐瑰嚮杩欓噷](https://tesseract-ocr.github.io/tessdoc/Data-Files#data-files-for-version-400-november-29-2016) ### PGID -鍏佽璁剧疆鐢ㄦ埛銆 +- 鍏佽璁剧疆鐢ㄦ埛銆 ### PUID -鍏佽璁剧疆鐢ㄦ埛銆 +- 鍏佽璁剧疆鐢ㄦ埛銆 ### TZ -鏃跺尯 +- 鏃跺尯 ### 闄勫姞搴旂敤绋嬪簭 -鎸囧畾瑕佸畨瑁呯殑鍏朵粬apk鏂囦欢;鐢ㄩ楀彿鍒嗛殧銆 +- 鎸囧畾瑕佸畨瑁呯殑鍏朵粬apk鏂囦欢;鐢ㄩ楀彿鍒嗛殧銆 ### 璇佷功 -ssl璇佷功锛屽繀椤讳綅浜庢湰鍦皊sl +- ssl璇佷功锛屽繀椤讳綅浜庢湰鍦皊sl ### cifs鍩 -cifs鍩 +- cifs鍩 ### cifs瀵嗙爜 -鍙夐」锛 smb瀵嗙爜锛屼笌smb shares瀵嗙爜鐩稿悓 +- 鍙夐」锛 smb瀵嗙爜锛屼笌smb shares瀵嗙爜鐩稿悓 ### cifs鐢ㄦ埛鍚 -鍙夐」锛 smb鐢ㄦ埛鍚嶏紝涓巗mb shares鐢ㄦ埛鍚嶇浉鍚 +- 鍙夐」锛 smb鐢ㄦ埛鍚嶏紝涓巗mb shares鐢ㄦ埛鍚嶇浉鍚 ### 榛樿鐢佃瘽鍖哄煙 -瀹氫箟榛樿鐢佃瘽鍖哄煙 https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements +- 瀹氫箟榛樿鐢佃瘽鍖哄煙 https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements ### 绂佺敤鏇存柊 -闃叉鎻掍欢鑷姩鏇存柊搴旂敤绋嬪簭銆 +- 闃叉鎻掍欢鑷姩鏇存柊搴旂敤绋嬪簭銆 ### elasticsearch鏈嶅姟鍣 -elasticsearch鏈嶅姟鍣╱rl +- elasticsearch鏈嶅姟鍣╱rl ### 鍚敤缂╃暐鍥 -涓哄獟浣撴枃浠跺惎鐢ㄥ嚑浠ｇ缉鐣ュ浘(鍦ㄦ棫绯荤粺涓鐢)銆 +- 涓哄獟浣撴枃浠跺惎鐢ㄥ嚑浠ｇ缉鐣ュ浘(鍦ㄦ棫绯荤粺涓鐢)銆 ### env_memory_limit -nextcloud鍙敤鍐呭瓨闄愬埗(榛樿涓512M)銆 +- nextcloud鍙敤鍐呭瓨闄愬埗(榛樿涓512M)銆 ### env_post_max_size -nextcloud post鏂囦欢澶у皬 (榛樿涓512M)銆 +- nextcloud post鏂囦欢澶у皬 (榛樿涓512M)銆 ### env_upload_max_filesize -nextcloud涓婁紶澶у皬(榛樿涓512M)銆 +- nextcloud涓婁紶澶у皬(榛樿涓512M)銆 ### 瀵嗛挜 -ssl瀵嗛挜锛屽繀椤讳綅浜庢湰鍦扮殑ssl銆 +- ssl瀵嗛挜锛屽繀椤讳綅浜庢湰鍦扮殑ssl銆 ### 鏈湴纾佺洏 -鐢ㄩ楀彿鍒嗛殧瑕佹寕杞界殑椹卞姩鍣ㄧ殑纭欢鍚嶇О鎴栧叾鏍囩銆備緥濡俿da1, sdb1, MYNAS鈥 +- 鐢ㄩ楀彿鍒嗛殧瑕佹寕杞界殑椹卞姩鍣ㄧ殑纭欢鍚嶇О鎴栧叾鏍囩銆備緥濡俿da1, sdb1, MYNAS鈥 ### 缃戠粶纾佺洏 -鍙夛紝瑕佹寕杞界殑smbv2/v3鏈嶅姟鍣ㄥ垪琛紝浠ラ楀彿鍒嗛殧 +- 鍙夛紝瑕佹寕杞界殑smbv2/v3鏈嶅姟鍣ㄥ垪琛紝浠ラ楀彿鍒嗛殧 ### 淇′换鍩 -鍏佽閫夋嫨淇′换鍩熴備笉鍦ㄦ鍒楄〃涓殑鍩熷皢琚垹闄わ紝闄や簡鍒濆閰嶇疆涓娇鐢ㄧ殑绗竴涓煙銆 +- 鍏佽閫夋嫨淇′换鍩熴備笉鍦ㄦ鍒楄〃涓殑鍩熷皢琚垹闄わ紝闄や簡鍒濆閰嶇疆涓娇鐢ㄧ殑绗竴涓煙銆 ### 浣跨敤鑷繁鐨勮瘉涔 -濡傛灉涓簍rue锛屽垯浣跨敤鎸囧畾鐨刢ertfile鍜宬eyfile銆 +- 濡傛灉涓簍rue锛屽垯浣跨敤鎸囧畾鐨刢ertfile鍜宬eyfile銆 \ No newline at end of file diff --git a/nextcloud/README.md b/nextcloud/README.md index 7724374..6ae244a 100644 --- a/nextcloud/README.md +++ b/nextcloud/README.md @@ -1,12 +1,9 @@ -# 鍐摐鐢勯塧ddons: Nextcloud +# 鍐摐鐢勯塧ddons锛歂extcloud -## About +## 鍏充簬 nextcloud涓汉涓撳睘鎴栧洟闃熷叡浜殑绉佹湁浜戝悓姝ョ綉鐩橈紝璇ョ増鏈湪鍘熺増nextcloud涓鍔犱簡Home assistant鐨勪紭鍖栬皟鏁村拰閰嶇疆閫夐」銆 -鍘熷鐗堟湰鏉ユ簮 : https://github.com/haberda/hassio_addons -杩欎釜鍔犺浇椤瑰熀浜 linuxserver.io涓璠docker image](https://github.com/linuxserver/docker-nextcloud) 銆 - ### 浣跨敤mariadb 浣滀负涓昏鐨勬暟鎹簱 (鎰熻阿@amaciuc) 濡傛灉浣犲湪绗竴娆¤繍琛寃ebui鏃,娉ㄦ剰浠ヤ笅璀﹀憡: @@ -37,4 +34,7 @@ If you use clients for file syncing, the use of SQLite is highly discouraged. - 4銆佽繘鍏eb骞跺～鍐欐墍鏈夊繀闇鐨勪俊鎭備笅闈㈡槸涓涓緥瀛: ![image](https://raw.gitcode.com/waxgourd/addons/files/master/nextcloud/images/nextcloud-1.png) +## 鏉ユ簮 +鍘熷鐗堟潵婧愶細https://github.com/haberda/hassio_addons +鍔犺浇椤瑰熀浜庯細https://github.com/linuxserver/docker-nextcloud diff --git a/onelist/CHANGELOG.md b/onelist/CHANGELOG.md index 6e8665e..1b511bd 100644 --- a/onelist/CHANGELOG.md +++ b/onelist/CHANGELOG.md @@ -1,3 +1,3 @@ -## v2.0.4 +### 2.0.4锛2024-01-12锛 - - 棣栨鍙戝竷銆 \ No newline at end of file +- 棣栨鎺ㄥ嚭 \ No newline at end of file diff --git a/onelist/DOCS.md b/onelist/DOCS.md index caff9d5..e61c907 100644 --- a/onelist/DOCS.md +++ b/onelist/DOCS.md @@ -1,18 +1,15 @@ # onelist -涓涓被浼糴mby鐨勪笓娉ㄤ簬鍒墛alist鑱氬悎缃戠洏褰㈡垚褰辫濯掍綋搴撶殑绋嬪簭銆 - ## 閰嶇疆璇存槑 ### 鏇存敼姝や富鏈轰笂鐢卞姞杞介」寮鏀剧殑绔彛锛 -榛樿5245锛屽彲鑷淇敼 +- 榛樿绔彛鍙凤細5245锛屽彲鑷淇敼 -鍙互閫氳繃娴忚鍣ㄩ〉闈㈣闂 锛堢鍙ｅ彿榛樿5245锛 +- 鍙互閫氳繃娴忚鍣ㄩ〉闈㈣闂 锛堢鍙ｅ彿榛樿5245锛 -璇︾粏浣跨敤鎸囧崡锛岃杩涘叆锛歨ttps://alist.nn.ci/zh/guide/ 鏌ョ湅 +- 璇︾粏浣跨敤鎸囧崡锛岃杩涘叆锛歨ttps://www.bilibili.com/video/BV15M41177LN -### 鍩烘湰浣跨敤璇存槑锛 +- 绠＄悊鍛: [admin@qq.com](mailto:admin@qq.com) -- 鐢ㄦ埛鍚: admin@qq.com - 瀵嗙爜: admin diff --git a/onelist/README.md b/onelist/README.md index 9ccbe24..1bc2346 100644 --- a/onelist/README.md +++ b/onelist/README.md @@ -1,6 +1,4 @@ -# 鍐摐鐢勯塧ddons: Onelist - - +# 鍐摐鐢勯塧ddons锛歄nelist ## 鍏充簬 @@ -9,12 +7,12 @@ ### 涓昏瑙ｅ喅浠ヤ笅鐥涚偣锛 - alist鎸傝浇浜戠洏鍚庤兘鍦ㄧ綉椤电鐪嬭棰戯紝鍗存病鏈夊垎绫伙紝娌℃湁娴锋姤澧 + - 浣跨敤webdav鎸傝浇鏈湴鍚庯紝鐢╦ellyfin鎴栬卐mby鍒墛浼氫笅杞借棰戞埅鍙栧皝闈㈠鑷村皝鍙 + - 鐢╦ellyfin鎴栬卐mby涔嬬被锛屾病鏈夊ぇ甯﹀鍏綉ip锛屽湪澶栭毦浠ヨ闂 - - -## 娣诲姞濯掍綋搴 +### 娣诲姞濯掍綋搴 1.瀵瑰簲杈撳叆濯掍綋搴撳悕瀛楋紝姣斿鐢靛奖锛岀被鍨嬮夋嫨movie @@ -24,6 +22,4 @@ ## 鏉ユ簮 -- 婧愰」鐩湴鍧锛歚https://github.com/msterzhang/onelist/` - - \ No newline at end of file +https://github.com/msterzhang/onelist/ \ No newline at end of file diff --git a/onenav/CHANGELOG.md b/onenav/CHANGELOG.md new file mode 100644 index 0000000..b5e7593 --- /dev/null +++ b/onenav/CHANGELOG.md @@ -0,0 +1,3 @@ +### 0.9.34锛2024-01-18锛 + +- 棣栨鎺ㄥ嚭 \ No newline at end of file diff --git a/onenav/DOCS.md b/onenav/DOCS.md new file mode 100644 index 0000000..b5ee949 --- /dev/null +++ b/onenav/DOCS.md @@ -0,0 +1,11 @@ +# OneNav + +## 閰嶇疆璇存槑 + +### 鏇存敼姝や富鏈轰笂鐢卞姞杞介」寮鏀剧殑绔彛锛 + +- 榛樿绔彛鍙凤細8880锛屽彲鑷淇敼 + +- 鍙互閫氳繃娴忚鍣ㄩ〉闈㈣闂 锛堢鍙ｅ彿榛樿8880锛 + +- 璇︾粏浣跨敤鎸囧崡锛岃杩涘叆锛歨ttps://doc.xiaoz.org/books/onenav \ No newline at end of file diff --git a/onenav/README.md b/onenav/README.md new file mode 100644 index 0000000..404ddc7 --- /dev/null +++ b/onenav/README.md @@ -0,0 +1,9 @@ +# 鍐摐鐢勯塧ddons锛歄neNav + +## 鍏充簬 + +OneNav鏄竴娆惧紑婧愬厤璐圭殑涔︾锛堝鑸級绠＄悊绋嬪簭锛屼娇鐢ㄤ娇鐢≒HP + SQLite 3寮鍙戯紝鐣岄潰绠娲侊紝瀹夎绠鍗曪紝浣跨敤鏂逛究銆 + +## 鏉ユ簮 + +https://github.com/helloxz/onenav \ No newline at end of file diff --git a/onenav/apparmor.txt b/onenav/apparmor.txt new file mode 100644 index 0000000..a7ea8b4 --- /dev/null +++ b/onenav/apparmor.txt @@ -0,0 +1,66 @@ +#include + +profile addon_db21ed7f_emby_nas flags=(attach_disconnected,mediate_deleted) { + #include + + capability, + file, + signal, + mount, + umount, + remount, + network udp, + network tcp, + network dgram, + network stream, + network inet, + network inet6, + network netlink raw, + network unix dgram, + + capability setgid, + capability setuid, + capability sys_admin, + capability dac_read_search, + # capability dac_override, + # capability sys_rawio, + +# S6-Overlay + /init ix, + /run/{s6,s6-rc*,service}/** ix, + /package/** ix, + /command/** ix, + /run/{,**} rwk, + /dev/tty rw, + /bin/** ix, + /usr/bin/** ix, + /usr/lib/bashio/** ix, + /etc/s6/** rix, + /run/s6/** rix, + /etc/services.d/** rwix, + /etc/cont-init.d/** rwix, + /etc/cont-finish.d/** rwix, + /init rix, + /var/run/** mrwkl, + /var/run/ mrwkl, + /dev/i2c-1 mrwkl, + # Files required + /dev/fuse mrwkl, + /dev/sda1 mrwkl, + /dev/sdb1 mrwkl, + /dev/nvme0 mrwkl, + /dev/nvme1 mrwkl, + /dev/ttyUSB0 mrwkl, + /dev/* mrwkl, + /tmp/** mrkwl, + + # Data access + /data/** rw, + + # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container + ptrace (trace,read) peer=docker-default, + + # docker daemon confinement requires explict allow rule for signal + signal (receive) set=(kill,term) peer=/usr/bin/docker, + +} diff --git a/onenav/config.yaml b/onenav/config.yaml new file mode 100644 index 0000000..8dee16a --- /dev/null +++ b/onenav/config.yaml @@ -0,0 +1,42 @@ +arch: + - aarch64 + - amd64 +backup_exclude: + - '*/data/' +codenotary: wghaos@163.com +description: '鍙府鍔╀綘灏嗘祻瑙堝櫒涔︾闆嗕腑寮忕鐞' +devices: + - /dev/dri + - /dev/dri/card0 + - /dev/dri/card1 + - /dev/dri/renderD128 + - /dev/vchiq + - /dev/ttyUSB0 + - /dev/sda + - /dev/sdb + - /dev/nvme + - /dev/nvme0n1p1 + - /dev/nvme0n1p2 + - /dev/mmcblk + - /dev/fuse + - /dev/net/tun +host_network: false +ingress: false +ingress_stream: false +init: false +name: OneNav +panel_icon: mdi:network +ports: + '80': 8880 +webui: "http://[HOST]:[PORT:8880]/" +privileged: + - SYS_ADMIN + - DAC_READ_SEARCH +slug: onenav +startup: services +boot: auto +url: https://gitcode.com/waxgourd/addons +image: docker.nju.edu.cn/wghaos/onenav +version: v0.9.34 +apparmor: true + diff --git a/onenav/icon.png b/onenav/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..835c1214f5bb7ff75c278361f695dfc099559ffb GIT binary patch literal 5628 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 杞婚噺鍖栫殑鏈湴缃戠粶瀛樺偍锛岃交鏉惧叡浜枃浠躲 -> - ## 閰嶇疆璇存槑 - ### 鐢ㄦ埛鍚: -        榛樿'homeassistant'锛屽彲鏍规嵁涓汉闇姹傛洿鏀广 + +- 榛樿'homeassistant'锛屽彲鏍规嵁涓汉闇姹傛洿鏀广 ### 瀵嗙爜: -        榛樿'123'锛屽彲鏍规嵁涓汉闇姹傛洿鏀广 + +- 榛樿'123'锛屽彲鏍规嵁涓汉闇姹傛洿鏀广 ### 宸ヤ綔缁: -        榛樿'WORKGROUP'锛屾牴鎹綘寤虹珛鐨勫伐浣滆屽～鍐欙紝榛樿涓衡淲ORKGROUP鈥濓紝闈炵壒娈婇渶姹傚彲涓嶅仛淇敼銆 + +- 榛樿'WORKGROUP'锛屾牴鎹綘寤虹珛鐨勫伐浣滆屽～鍐欙紝榛樿涓衡淲ORKGROUP鈥濓紝闈炵壒娈婇渶姹傚彲涓嶅仛淇敼銆 ### 鍏煎妯″紡锛 -        榛樿鍏抽棴锛岄潪鐗规畩闇姹傚彲涓嶅仛淇敼銆 + +- 榛樿鍏抽棴锛岄潪鐗规畩闇姹傚彲涓嶅仛淇敼銆 ### 闅愯棌鏂囦欢锛 -        鑷畾涔夐殣钘忔枃浠讹紝闈炵壒娈婇渶姹傚彲涓嶅仛淇敼銆 + +- 鑷畾涔夐殣钘忔枃浠讹紝闈炵壒娈婇渶姹傚彲涓嶅仛淇敼銆 ### 鍏佽璁块棶锛 -        鍏佽閭ｄ簺IP鍦板潃鎴朓P娈靛彲浠ヨ闂湰鏈嶅姟銆傞潪鐗规畩闇姹傚彲涓嶅仛淇敼銆 + +- 鍏佽閭ｄ簺IP鍦板潃鎴朓P娈靛彲浠ヨ闂湰鏈嶅姟銆傞潪鐗规畩闇姹傚彲涓嶅仛淇敼銆 ### 缃戠粶閫傞厤鍣細 -鈥 杩欓噷濉啓samba浣跨敤鐨勭綉缁滈傞厤鍣紝x86涓鑸负enp2s1锛屽叾浠栫殑end0锛屾渶濂絥et info鍛戒护鏌ョ湅涓涓嬨 + +- 杩欓噷濉啓samba浣跨敤鐨勭綉缁滈傞厤鍣紝x86涓鑸负enp2s1锛屽叾浠栫殑end0锛屾渶濂絥et info鍛戒护鏌ョ湅涓涓嬨 ### 鏈湴瀛樺偍鍣細 -        鎸傝浇鐨勬湰鍦板瓨鍌ㄥ櫒(濉啓sda1鎴杝db1)锛屾煡鐪媓ost涓绘満涓寕杞界殑鐩樹綅浜/dev銆 鏀寔鏂囦欢绯荤粺鈥滷AT32銆丗AT16銆丒XT3銆丒XT4鈥滅瓑銆 +- 鎸傝浇鐨勬湰鍦板瓨鍌ㄥ櫒(濉啓sda1鎴杝db1)锛屾煡鐪媓ost涓绘満涓寕杞界殑鐩樹綅浜/dev銆 鏀寔鏂囦欢绯荤粺鈥滷AT32銆丗AT16銆丒XT3銆丒XT4鈥滅瓑銆 \ No newline at end of file diff --git a/samba-easy-nas/README.md b/samba-easy-nas/README.md index b194106..bcbee99 100644 --- a/samba-easy-nas/README.md +++ b/samba-easy-nas/README.md @@ -1,3 +1,9 @@ -# 杞婚噺鍖朣amba NAS +# 鍐摐鐢勯塧ddons锛氳交閲忓寲Samba NAS -    杞婚噺鍖栫殑鏈湴缃戠粶瀛樺偍锛屽彲閫夐厤缃戝崱锛屽彲鎸傝浇纭洏锛岃交鏉惧叡浜枃浠躲 +## 鍏充簬 + +杞婚噺鍖栫殑鏈湴缃戠粶瀛樺偍锛屽彲閫夐厤缃戝崱锛屽彲鎸傝浇纭洏锛岃交鏉惧叡浜枃浠躲 + +## 鏉ユ簮 + +鍐摐鐢勯夊嚭鍝 \ No newline at end of file diff --git a/zigbee2mqtt/CHANGELOG.md b/zigbee2mqtt/CHANGELOG.md index 7370e8c..8d45afe 100644 --- a/zigbee2mqtt/CHANGELOG.md +++ b/zigbee2mqtt/CHANGELOG.md @@ -1,460 +1,11 @@ -## 1.35.1-1 +## 1.35.1-1锛2024-01-07锛 -- Updated Zigbee2MQTT to version [`1.35.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.35.1) +- 鍗囩骇Zigbee2MQTT鏈鏂扮増鏈 [`1.35.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.35.1) -## 1.35.0-1 +## 1.35.0-1锛2024-01-01锛 -- Updated Zigbee2MQTT to version [`1.35.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.35.0) +- 鍗囩骇Zigbee2MQTT鏈鏂扮増鏈 [`1.35.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.35.0) -## 1.34.0-1 -- Updated Zigbee2MQTT to version [`1.34.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.34.0) +## 1.34.0-1锛2023-12-18锛 -## 1.33.2-1 -- Updated Zigbee2MQTT to version [`1.33.2`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.33.2) - -## 1.33.1-1 -- Updated Zigbee2MQTT to version [`1.33.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.33.1) - -## 1.33.0-1 -- Updated Zigbee2MQTT to version [`1.33.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.33.0) - -## 1.32.2-1 -- Updated Zigbee2MQTT to version [`1.32.2`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.32.2) - -## 1.32.1-1 -- Updated Zigbee2MQTT to version [`1.32.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.32.1) - -## 1.32.0-2 -- Fix issue with configuration URL - -## 1.32.0-1 -- Updated Zigbee2MQTT to version [`1.32.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.32.0) -- Enable url setting in order to add Visit button in HA UI - -## 1.31.2-1 -- Updated Zigbee2MQTT to version [`1.31.2`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.31.2) - -## 1.31.1-1 -- Updated Zigbee2MQTT to version [`1.31.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.31.1) - -## 1.31.0-1 -- Updated Zigbee2MQTT to version [`1.31.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.31.0) - -## 1.30.4-1 -- Updated Zigbee2MQTT to version [`1.30.4`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.30.4) - -## 1.30.3-1 -- Updated Zigbee2MQTT to version [`1.30.3`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.30.3) - -## 1.30.2-1 -- Updated Zigbee2MQTT to version [`1.30.2`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.30.2) - -## 1.30.1-1 -- Updated Zigbee2MQTT to version [`1.30.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.30.1) - -## 1.30.0-1 -- Updated Zigbee2MQTT to version [`1.30.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.30.0) - -## 1.29.2-1 -- Updated Zigbee2MQTT to version [`1.29.2`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.29.2) - -## 1.29.1-1 -- Updated Zigbee2MQTT to version [`1.29.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.29.1) - -## 1.29.0-1 -- Updated Zigbee2MQTT to version [`1.29.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.29.0) - -## 1.28.4-1 -- Updated Zigbee2MQTT to version [`1.28.4`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.28.4) - -## 1.28.3-1 -- Updated Zigbee2MQTT to version [`1.28.3`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.28.3) - -## 1.28.2-1 -- Updated Zigbee2MQTT to version [`1.28.2`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.28.2) - -## 1.28.1-1 -- Updated Zigbee2MQTT to version [`1.28.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.28.1) - -## 1.28.0-1 -- Updated Zigbee2MQTT to version [`1.28.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.28.0) -- Fix `Can't open config file at null/configuration.yaml` error - -## 1.27.2-1 -- Updated Zigbee2MQTT to version [`1.27.2`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.27.2) - -## 1.27.1-1 -- Updated Zigbee2MQTT to version [`1.27.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.27.1) -- Fix Zigbee2MQTT process being killed instead of stopped when addon is stopped. This prevented the backup on shutdown from happening. - -## 1.27.0-1 -- Updated Zigbee2MQTT to version [`1.27.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.27.0) - -## 1.26.0-1 -- Updated Zigbee2MQTT to version [`1.26.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.26.0) - -## 1.25.2-1 -- Updated Zigbee2MQTT to version [`1.25.2`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.25.2) - -## 1.25.1-2 -- Fixes for [s6 v3 update](https://developers.home-assistant.io/blog/2022/05/12/s6-overlay-base-images) -- Pin base image version to 3.14 as 3.15 doesn't work yet - -## 1.25.1-1 -- Updated Zigbee2MQTT to version [`1.25.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.25.1) - -## 1.25.0-1 -- Updated Zigbee2MQTT to version [`1.25.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.25.0) -- 鈿狅笍 **Breaking changes** - - Most Zigbee2MQTT configuration is now done in Zigbee2MQTT directly - (either via the UI or by modifying the configuration file, usually - `/config/zigbee2mqtt/configuration.yaml`, directly). - - As Zigbee2MQTT won't start with an [MQTT server](https://www.zigbee2mqtt.io/guide/configuration/mqtt.html) - or [serial adapter](https://www.zigbee2mqtt.io/guide/configuration/adapter-settings.html) - you must configure these through the add-on configuration page before you - can start Zigbee2MQTT for the first time. - - Existing installations should be able to safely remove the Zigbee2MQTT - configuration from the add-on configuration as these values should have - already been persisted to the configuration file. - -## 1.24.0-1 -- Updated Zigbee2MQTT to version [`1.24.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.24.0) - -## 1.23.0-1 -- Updated Zigbee2MQTT to version [`1.23.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.23.0) - -## 1.22.2-1 -- Updated Zigbee2MQTT to version [`1.22.2`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.22.2) - -## 1.22.1-1 -- Updated Zigbee2MQTT to version [`1.22.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.22.1) - -## 1.22.0-3 -- Add availability configuration - -## 1.22.0-2 -- Fix availability configuration - -## 1.22.0-1 -- Updated Zigbee2MQTT to version [`1.22.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.22.0) - -## 1.21.2-1 -- Updated Zigbee2MQTT to version [`1.21.2`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.21.2) - -## 1.21.1-1 -- Updated Zigbee2MQTT to version [`1.21.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.21.1) - -## 1.21.0-4 -- Added `advanced.log_output` config option - -## 1.21.0-3 -- Added support for `humidity_precision` option under `device_options` - -## 1.21.0-2 -- Added homeassistant_legacy_entity_attributes option - -## 1.21.0-1 -- Updated Zigbee2MQTT to version [`1.21.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.21.0) - -## 1.20.0-1 -- Updated Zigbee2MQTT to version [`1.20.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.20.0) - -## 1.19.1-1 -- Updated Zigbee2MQTT to version [`1.19.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.19.1) - -## 1.19.0-1 -- Updated Zigbee2MQTT to version [`1.19.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.19.0) - -## 1.18.3-1 -- Updated Zigbee2MQTT to version [`1.18.3`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.18.3) - -## 1.18.2-1 -- Updated Zigbee2MQTT to version [`1.18.2`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.18.2) - -## 1.18.1-2 -- Added missing ezsp agapter type for serial - -## 1.18.1-1 -- Updated Zigbee2MQTT to version [`1.18.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.18.1) -- Fix OTA configuration required when starting - -## 1.18.0-1 -- Updated Zigbee2MQTT to version [`1.18.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.18.0) - -## 1.17.1-4 -- Switched socat from `/share/zigbee2mqtt/ttyZ2M` to `/tmp/ttyZ2M` - -## 1.17.1-3 -- Added back `transmit_power` to `experimental` - -## 1.17.1-2 -- Fixes #24 for socat - -## 1.17.1-1 -- Removed `new_api` option as it's now default -- Removed `transmit_power` from `experimental` -- Added support for `legacy_api` option under `advanced` -- Added support for `ikea_ota_use_test_url` option under `advanced` - -## 1.17.1 -- Updated Zigbee2MQTT to version [`1.17.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.17.1) -- Updated `"auto_uart": true` to use `"uart": true` instead -- Reduced image size - thanks https://github.com/G1K -- Deprecated `devices.js` method for adding support for a new device - -## 1.17.0 -- Updated Zigbee2MQTT to version [`1.17.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.17.0) -- New configuration options - - `advanced` - - `adapter_delay` - - `serial` - - `adapter: zigate` -## 1.16.2 -- Updated Zigbee2MQTT to version [`1.16.2`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.16.2) -- New configuration options - - `mqtt` - - `force_disable_retain` - - `frontend` - - `host` -- `devices` and `groups` options now accept a comma-separated string of files - -## 1.16.1-1 -- Allow add-on to start with other mqtt servers not just built in - -## 1.16.1 -- Updated Zigbee2MQTT to version [`1.16.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.16.1) - -## 1.16.0 -- Updated Zigbee2MQTT to version [`1.16.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.16.0) - -## 1.15.0-3 -- Fixed `external_converters` not working - -## 1.15.0-2 -- 鈿狅笍 **Breaking changes** - - `zigbee_shepherd_debug` removed -- Add-on images are now taken from Docker Hub `zigbee2mqtt` [organisation](https://hub.docker.com/orgs/zigbee2mqtt/repositories) -- Changed `mqtt.server`, `mqtt.user`, `mqtt.password` to be optional -- Added support for mqtt auto discovery (server, user, password) -- Removed `pm2` -- Removed `socat.restartdelay` and `socat.initialdelay` -- Unified Dockerfile into a single common file -- 鈿狅笍 Changed `run.sh` and `socat.sh` to use [s6-overlay](https://github.com/just-containers/s6-overlay) -- Version management now only in `config.json` -- Default `data_path` changed from `/share/` to `/config` -- Changed default logging level to `warn` -- Changed version format to `X.X.X-A` - -## 1.15.0 -- Updated Zigbee2MQTT to version [`1.15.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.15.0) -- Added support for a [built-in frontend](https://github.com/Koenkk/zigbee2mqtt/issues/4266) using `ingress`. See Documentation tab for more details. - -## 1.14.4.2 -- Added readme for Edge version -- Added logo on both Edge and Stable version -- Startup for addon moved from `before` to `application` -- Fixed empty changelog in Edge version -- Fixed add-on crash for starting too early for some users -- Fixed `.hash.json` to get properly generated (`commit #unknown` resolved) - -## 1.14.4.1 -- 鈿狅笍 **Breaking changes** - - `availability_blacklist` renamed to `availability_blocklist` in `advanced` - - `availability_passlist` now required option in `advanced` - - `ban` renamed to `blocklist` - - `whitelist` renamed to `passlist` - -Change -``` -availability_blacklist: [] -``` -to -``` -availability_blocklist: [] -availability_passlist: [] -``` - -Remove -``` -ban: [] -whitelist: [] -``` - -- Added explicit support for `armv7` -- Added new config options from Zigbee2MQTT: - - `external_converters` - - `mqtt` - - `keepalive` - - `version` - - `advanced` - - `adapter_concurrent` - - `cache_state_persistent` - - `cache_state_send_on_startup` - - `device_options` - - `occupancy_timeout` - - `temperature_precision` - - `legacy` - - `device_options_string` - - `homeassistant_legacy_triggers` - - `log_level` - - `log_rotation` - - `timestamp_format` - - `experimental` - - `output` - -- Fixed change log bug for Stable version -- Updated names to reflect Hass.io [rename](https://www.home-assistant.io/blog/2020/01/29/changing-the-home-assistant-brand/) to Home Assistant - -## 1.14.4 -- Updated Zigbee2MQTT to version [`1.14.4`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.14.4) - -## 1.14.3 -- Added new config option from Zigbee2MQTT: `adapter` in `serial` -- Updated Zigbee2MQTT to version [`1.14.3`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.14.3) - -## 1.14.2 -- Updated Zigbee2MQTT to version [`1.14.2`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.14.2) - -## 1.14.1 -- Updated Zigbee2MQTT to version [`1.14.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.14.1) - -## 1.14.0 -- Updated Zigbee2MQTT to version [`1.14.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.14.0) - -## 1.13.1 -- Added config option `transmit_power` in `experimental` -- Updated Zigbee2MQTT to version [`1.13.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.13.1) - -## 1.13.0 -- Updated Zigbee2MQTT to version [`1.13.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.13.0) - -## 1.12.2 -- Updated Zigbee2MQTT to version [`1.12.2`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.12.2) - -## 1.12.1 -- Updated Zigbee2MQTT to version [`1.12.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.12.1) - -## 1.12.0 -- Updated Zigbee2MQTT to version [`1.12.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.12.0) - -## 1.11.0 -- Updated Zigbee2MQTT to version [`1.11.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.11.0) - -## 1.10.1 -- Added config options `network_key_string` and `ext_pan_id_string`. - -## 1.10.0 -- Updated Zigbee2MQTT to version [`1.10.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.10.0) - -## 1.9.0 -- Added config option `zigbee_herdsman_debug` (`zigbee_shepherd_debug` still supported for now) -- Updated Zigbee2MQTT to version [`1.9.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.9.0) - -## 1.8.0 -- Updated Zigbee2MQTT to version [`1.8.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.8.0) - -## 1.7.1 -- Updated Zigbee2MQTT to version [`1.7.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.7.1) - -## 1.7.0 -- 鈿狅笍 **Breaking changes**: You cannot roll back to 1.6 without repairing all your devices -- 鈿狅笍 Added socat support: leave `enabled` set to `false` to disable. -- Updated Zigbee2MQTT to version [`1.7.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.7.0) - -## 1.6.0 -- Update Zigbee2MQTT to [`1.6.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.6.0) - -## 1.5.1.2 -- Create `$DATA_PATH` if it does not already exist -- Fixed [#197](https://github.com/danielwelch/hassio-zigbee2mqtt/issues/197) - -## 1.5.1.1 -- Added several configuration items: - - `advanced.availability_blacklist` - - `ban` - - `whitelist` - - `queue` (along with `queue.delay` and `queue.simultaneously`) - - `mqtt.key`, `mqtt.ca`, `mqtt.cert` - - `advanced.report`, `advanced.homeassistant_discovery_topic`, `advanced.homeassistant_status_topic` -- Add back `zigbee_shepherd_debug`,`zigbee_shepherd_devices`, and `disable_led` -- Include default network key in default configuration - -## 1.5.1 -- 鈿狅笍 **Breaking changes**: restructured configuration to more closely mirror Zigbee2MQTT -- Updated Zigbee2MQTT to version [`1.5.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.5.1) - -## 1.3.0 -- Updated Zigbee2MQTT to version [`1.3.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.3.0) -- Added new config option from zigbee2mqtt: - - `homeassistant_discovery_topic` - - `debounce` (device-specific config) -- Fixed logic bug that prevented configuration from being updated in the add-on ui. - -## 1.2.1 -- Updated Zigbee2MQTT to version [`1.2.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.2.1) -- Use Node.js 10 as base docker image -- Added new config option from Zigbee2MQTT: `report` - -## 1.1.1 -- Updated Zigbee2MQTT to version [`1.1.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.1.1) - -## 1.1.0.1 -- Added `network_key` to options, defaulting to empty list. If left empty, the option will not be passed to zigbee2mqtt. -- Update README to reflect requirements for `devices` and `network_key` options - -## 1.1.0 -- Updated Zigbee2MQTT to version [`1.0.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.1.0) -- Added new config options from Zigbee2MQTT: - - `soft_reset_timeout` - - `last_seen` - - `elapsed` - - `network_key` - - `devices` (device-specific configuration) -- Added `overwrite` option, which can be set to `false` to prevent the add-on from overwriting corresponding fields on startup that are already set in the `configuration.yaml` file. - -## 1.0.1 -- Updated Zigbee2MQTT to version [`1.0.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.0.1) - -## 1.0.0 -- Updated Zigbee2MQTT to version [`1.0.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.0.0) -- Added new or changed options for Zigbee2MQTT: - - `reject_unauthorized` - - `pan_id` - - `channel` - -## 0.1.6 -- Updated Zigbee2MQTT to version [`0.1.6`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/0.1.6) - -## 0.1.5.1 -- Fixed [#53](https://github.com/danielwelch/hassio-zigbee2mqtt/issues/53) and [#54](https://github.com/danielwelch/hassio-zigbee2mqtt/issues/54), regarding `log_directory` setting -- Fixed README typo regarding `disable_led`. This option is now called `disable_led` in accordance with zigbe22mqtt. Although this was changed in 0.1.3.1, README was not updated to reflect that. - -## 0.1.5 -- Updated Zigbee2MQTT to version [`0.1.5`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/0.1.5) - -## 0.1.3.1 -- Added new or changed options for Zigbee2MQTT: - - `mqtt_client_id` - - `disable_led` (*renamed from `serial_disable_led`*) - - `cache_state` - - `log_directory` - - `log_level` - - `rtscts` - - `zigbee_shepherd_debug` - -## 0.1.3 -- Updated Zigbee2MQTT to version [`0.1.3`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/0.1.3) - -## 0.1.2 -- Updated Zigbee2MQTT to version [`0.1.2`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/0.1.2) - -## 0.1.1 -- Switch the Edge and Stable `Dockerfiles` so they're actually correct -- Download release archives instead of git cloning the specific branch -- Updated Zigbee2MQTT to version [`0.1.1`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/0.1.1) - -## 0.1.0 -- First versioned release of the add-on -- Updated Zigbee2MQTT to version [`0.1.0`](https://github.com/Koenkk/zigbee2mqtt/releases/tag/0.1.0) +- 棣栨鎺ㄥ嚭 \ No newline at end of file diff --git a/zigbee2mqtt/DOCS.md b/zigbee2mqtt/DOCS.md index 3fb982b..f05900a 100644 --- a/zigbee2mqtt/DOCS.md +++ b/zigbee2mqtt/DOCS.md @@ -1,13 +1,10 @@ # Zigbee2MQTT -瀹樻柟Zigbee2MQTT瀹跺涵鍔╃悊鎻掍欢銆 - - ## 閰嶇疆璇存槑 ### mqtt -鈥 濡傛灉涓嶄娇鐢╩osquito to broker鎻掍欢锛岃濉啓MQTT璇︾粏淇℃伅(浣跨敤mosquito to broker鎻掍欢鏃跺彲涓嶅～鍐)銆傛牸寮忓彲鍙傝冧笅闈㈢殑瀹炰緥 +- 濡傛灉涓嶄娇鐢╩osquito to broker鎻掍欢锛岃濉啓MQTT璇︾粏淇℃伅(浣跨敤mosquito to broker鎻掍欢鏃跺彲涓嶅～鍐)銆傛牸寮忓彲鍙傝冧笅闈㈢殑瀹炰緥 ``` server: mqtt://localhost:1883 @@ -19,10 +16,16 @@ password: "Mqtt鐨勫瘑鐮" ### serial -鈥 濉啓涓茶璇︾粏淇℃伅(渚嬪USB鍗忚皟鍣ㄧ殑绔彛)銆傛牸寮忓彲鍙傝冧笅闈㈢殑瀹炰緥 +- 濉啓涓插彛璇︾粏淇℃伅(渚嬪USB鍗忚皟鍣ㄧ殑绔彛)銆傛牸寮忓彲鍙傝冧笅闈㈢殑瀹炰緥 ``` port: /dev/ttyUSB0 ``` 濡傛灉鎮ㄤ笉鐭ラ亾璇︾粏鐨勭鍙ｏ紝骞朵笖鍙湁涓涓猆SB璁惧杩炴帴鍒版偍鐨勬満鍣紝璇峰皾璇/dev/ ttyUSB0銆傚惁鍒欙紝璇锋煡鐪嬧滈厤缃 - 绯荤粺 - 纭欢 - 鍏ㄩ儴纭欢鈥濓紝鍦ㄦ悳绱笂杈撳叆鈥渢ty鈥濇煡鐪嬨 + +## 浣跨敤鏂规硶 + +- 鐐瑰嚮鍚姩锛堝惎鍔ㄦ椂闀垮ぇ绾︿竴鍒嗛挓锛夛紝杩涘叆鏃ュ織椤甸潰涓偣鍑诲埛鏂帮紝鍑虹幇鈥淶igbee2MQTT started!鈥濆垯琛ㄧず鍚姩鎴愬姛銆 + +- 鍚姩瀹屾垚鍚庡彲鍦ㄤ俊鎭〉涓偣鍑"鎵撳紑 WEI UI"锛屾垨鐐瑰嚮鈥滃湪渚ц竟鏍忔樉绀衡濓紝鏂逛究浠ュ悗浠庡乏渚ф爮蹇熻闂 \ No newline at end of file diff --git a/zigbee2mqtt/README.md b/zigbee2mqtt/README.md index ad7c50e..610dbfa 100644 --- a/zigbee2mqtt/README.md +++ b/zigbee2mqtt/README.md @@ -1,4 +1,4 @@ -# H鍐摐鐢勯塧ddons: Zigbee2MQTT +# 鍐摐鐢勯塧ddons锛歓igbee2MQTT ## 鍏充簬