add app-meta-dockermanager (#675)
-
add app-meta-dockermanager
-
dockermanager fix
Co-authored-by: jannson <jannon.wei@gmail.com>
diff --git a/applications/app-meta-dockermanager/Makefile b/applications/app-meta-dockermanager/Makefile
new file mode 100644
index 0000000..2c5f4e0
--- /dev/null
+++ b/applications/app-meta-dockermanager/Makefile
@@ -0,0 +1,22 @@
+# This is free software, licensed under the Apache License, Version 2.0 .
+
+include $(TOPDIR)/rules.mk
+
+PKG_VERSION:=0.1.1
+PKG_RELEASE:=1
+META_TITLE:=Docker管理
+META_TITLE.en:=Docker Manager
+META_DEPENDS:=+dockermanager +luci-app-dockermanager
+META_DESCRIPTION:=更简单专业的 Docker 管理器，加速更快更方便.
+META_DESCRIPTION.en:=Docker management module for LinkEase Desktop.
+META_AUTHOR:=linkease
+META_ARCH:=x86_64 aarch64
+META_TAGS:=system docker
+META_LUCI_ENTRY:=/cgi-bin/luci/admin/services/dockermanager/open
+META_WEBSITE:=https://github.com/linkease/linkease-docker-manager
+META_AUTOCONF:=path enable
+META_UCI:=dockermanager
+
+include ../../meta.mk
+
+# call BuildPackage - OpenWrt buildroot signature
diff --git a/applications/app-meta-dockermanager/config.sh b/applications/app-meta-dockermanager/config.sh
new file mode 100644
index 0000000..70e1e83
--- /dev/null
+++ b/applications/app-meta-dockermanager/config.sh
@@ -0,0 +1,20 @@
+[ -z "$ISTORE_CONF_DIR" ] && exit 1
+
+ENABLED=1
+if [ -n "$ISTORE_DONT_START" ]; then
+ ENABLED=0
+fi
+
+mkdir -p "$ISTORE_CONF_DIR/DockerManager" || exit 1
+
+uci -q batch <<-EOF >/dev/null || exit 1
+ set dockermanager.@dockermanager[0].enabled=$ENABLED
+ set dockermanager.@dockermanager[0].data_dir="$ISTORE_CONF_DIR/DockerManager"
+ set dockermanager.@dockermanager[0].port="8192"
+ set dockermanager.@dockermanager[0].bind_addr="0.0.0.0"
+ set dockermanager.@dockermanager[0].base_path="/apps/dockermanager/"
+ commit dockermanager
+EOF
+
+/etc/init.d/dockermanager restart || true
+[ -x /etc/init.d/linkease ] && /etc/init.d/linkease restart >/dev/null 2>&1 &
diff --git a/applications/app-meta-dockermanager/entry.sh b/applications/app-meta-dockermanager/entry.sh
new file mode 100644
index 0000000..b9f3f5b
--- /dev/null
+++ b/applications/app-meta-dockermanager/entry.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+status(){
+ local host="$1"
+ [ -n "$host" ] || host=127.0.0.1
+ . /usr/share/libubox/jshn.sh
+ json_init
+ json_add_string "app" "dockermanager"
+ json_add_boolean "docker" "1"
+
+ local port
+ port="$(uci get dockermanager.@dockermanager[0].port 2>/dev/null)"
+ local portsec=${port:-8192}
+ local base_path
+ base_path="$(uci get dockermanager.@dockermanager[0].base_path 2>/dev/null)"
+ local basepath=${base_path:-/apps/dockermanager/}
+ case "$basepath" in
+ /*) ;;
+ *) basepath="/$basepath" ;;
+ esac
+ case "$basepath" in
+ */) ;;
+ *) basepath="$basepath/" ;;
+ esac
+
+ if pidof docker-manager >/dev/null 2>&1; then
+ json_add_boolean "running" "1"
+ json_add_string "web" ":${portsec}"
+ json_add_string "href" "http://$host:${portsec}${basepath}"
+ json_add_string "protocol" http
+ json_add_string "port" "${portsec}"
+ json_add_boolean "deployed" "1"
+ else
+ json_add_boolean "running" "0"
+ if [ -x /etc/init.d/dockermanager ]; then
+ json_add_boolean "deployed" "1"
+ else
+ json_add_boolean "deployed" "0"
+ fi
+ fi
+
+ json_dump
+ json_cleanup >/dev/null
+}
+
+start(){
+ /etc/init.d/dockermanager start
+}
+
+stop(){
+ /etc/init.d/dockermanager stop
+}
+
+ACTION=${1}
+shift 1
+[ -z "${ACTION}" ] && ACTION=help
+
+case ${ACTION} in
+ "status" | "start" | "stop")
+ ${ACTION} "$@"
+ ;;
+ *)
+ echo "Unknown Action" >&2
+ exit 1
+ ;;
+esac
diff --git a/applications/app-meta-dockermanager/logo.png b/applications/app-meta-dockermanager/logo.png
new file mode 100644
index 0000000..7d24295
Binary files /dev/null and b/applications/app-meta-dockermanager/logo.png differ
diff --git a/applications/app-meta-istoreenhance/Makefile b/applications/app-meta-istoreenhance/Makefile
index 559c9f9..8b596d2 100644
--- a/applications/app-meta-istoreenhance/Makefile
+++ b/applications/app-meta-istoreenhance/Makefile
@@ -2,8 +2,8 @@
include $(TOPDIR)/rules.mk
-PKG_VERSION:=0.7.15
-PKG_RELEASE:=2
+PKG_VERSION:=0.7.16
+PKG_RELEASE:=1
META_TITLE:=KSpeeder(原iStore增强)
META_TITLE.en:=KSpeeder(iStoreEnhance)
META_DEPENDS:=+istoreenhance +luci-app-istoreenhance +luci-i18n-istoreenhance-zh-cn
diff --git a/applications/app-meta-istorex/Makefile b/applications/app-meta-istorex/Makefile
index 618a50b..85107dd 100644
--- a/applications/app-meta-istorex/Makefile
+++ b/applications/app-meta-istorex/Makefile
@@ -2,17 +2,17 @@
include $(TOPDIR)/rules.mk
-PKG_VERSION:=0.6.6
-PKG_RELEASE:=4
-META_TITLE:=istorex
-META_TITLE.en:=istorex
-META_DEPENDS:=+luci-app-istorex
-META_DESCRIPTION:=为iStoreOS适配的全新首页。
-META_DESCRIPTION.en:=A new homepage for iStoreOS.
-META_AUTHOR:=Carseason
+PKG_VERSION:=1.0.0
+PKG_RELEASE:=1
+META_TITLE:=iStoreNAS(原iStoreX)
+META_TITLE.en:=iStoreNAS(iStoreX)
+META_DEPENDS:=+app-meta-linkeasefull +app-meta-dockermanager +app-meta-kaiplus +app-meta-kai +app-meta-baidudrive +app-meta-istoreenhance +luci-theme-istorenas
+META_DESCRIPTION:=把 iStoreOS 一键变成 NAS 系统，网盘，同步，组网，时光机，AI 等一网打尽。
+META_DESCRIPTION.en:=Turn iStoreOS into a NAS system in one click, covering cloud drives, sync, networking, Time Machine, AI, and more.
+META_AUTHOR:=Xiaobao
META_ARCH:=x86_64 aarch64
META_TAGS:=net system
-META_LUCI_ENTRY:=/cgi-bin/luci/admin/istorex
+META_LUCI_ENTRY:=/cgi-bin/luci/admin/services/linkeasefull/open
META_WEBSITE:=https://github.com/linkease/nas-packages-luci
META_TUTORIAL:=https://doc.linkease.com/zh/guide/istore/software/istorex.html
diff --git a/applications/app-meta-istorex/config.sh b/applications/app-meta-istorex/config.sh
new file mode 100755
index 0000000..3a52932
--- /dev/null
+++ b/applications/app-meta-istorex/config.sh
@@ -0,0 +1,29 @@
+
+[ -z "$ISTORE_CONF_DIR" ] && exit 1
+
+LANDING_PAGE="/cgi-bin/luci/admin/services/linkeasefull/open"
+
+[ -e /etc/config/luci ] || touch /etc/config/luci || exit 1
+[ -e /etc/config/istorenas ] || touch /etc/config/istorenas || exit 1
+
+if ! uci -q show luci.main >/dev/null; then
+ uci -q set luci.main=core || exit 1
+fi
+
+if ! uci -q show luci.themes >/dev/null; then
+ uci -q set luci.themes=internal || exit 1
+fi
+
+if ! uci -q show istorenas.@login[0] >/dev/null; then
+ uci -q add istorenas login >/dev/null || exit 1
+fi
+
+uci -q batch <<-EOF >/dev/null || exit 1
+ set luci.themes.iStoreNAS="/luci-static/istorenas"
+ set luci.main.mediaurlbase="/luci-static/istorenas"
+ set istorenas.@login[0].landing_page="$LANDING_PAGE"
+ commit luci
+ commit istorenas
+EOF
+
+rm -f /tmp/luci-indexcache /tmp/luci-indexcache.*
diff --git a/applications/app-meta-kaiplus/Makefile b/applications/app-meta-kaiplus/Makefile
index 1792b43..df9fcc1 100644
--- a/applications/app-meta-kaiplus/Makefile
+++ b/applications/app-meta-kaiplus/Makefile
@@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk
-PKG_VERSION:=1.0.5
+PKG_VERSION:=1.0.6
PKG_RELEASE:=1
META_TITLE:=KaiPlus
META_TITLE.en:=KaiPlus
GitHub
sha: ecb89eb3d3adc5c50fbe5ae7552242bab43a5dbc