+ <% if container_running then %>
+
+ <% else %>
+
+ <% end %>
+
+
+<%
+if container_running then
+ local port=util.trim(util.exec("/usr/libexec/istorec/nextcloud.sh port"))
+ if port == "" then
+ port="8082"
+ end
+-%>
+
+
+
+
+
+
+
+<% end %>
\ No newline at end of file
diff --git a/applications/luci-app-nextcloud/po/zh-cn/nextcloud.po b/applications/luci-app-nextcloud/po/zh-cn/nextcloud.po
index 0330ea7..13fd28f 100644
--- a/applications/luci-app-nextcloud/po/zh-cn/nextcloud.po
+++ b/applications/luci-app-nextcloud/po/zh-cn/nextcloud.po
@@ -1,27 +1,38 @@
-msgid "The nextcloud service is running."
-msgstr "nextcloud已启动"
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
-msgid "The nextcloud service is not running."
-msgstr "nextcloud服务未启动"
+msgid "Official website:"
+msgstr "官方网站："
-msgid "The nextcloud service is not installed."
-msgstr "nextcloud服务未安装"
+msgid "A safe home for all your data. Access & share your files, calendars, contacts, mail & more from any device, on your terms."
+msgstr "所有数据的安全之家。 根据您的条件，从任何设备访问和共享您的文件、日历、联系人、邮件等。"
-msgid "open nextcloud"
-msgstr "打开nextcloud"
+msgid "Config path"
+msgstr "配置文件路径"
-msgid "stop nextcloud"
-msgstr "停止nextcloud"
+msgid "Port"
+msgstr "端口"
-msgid "run nextcloud"
-msgstr "启动nextcloud"
+msgid "Service Status"
+msgstr "服务状态"
-msgid "uninstall nextcloud"
-msgstr "删除nextcloud"
+msgid "Nextcloud status:"
+msgstr "Nextcloud 的状态信息如下："
-msgid "install nextcloud"
-msgstr "安装nextcloud"
+msgid "Setup"
+msgstr "安装配置"
-msgid "Collecting data..."
-msgstr "收集数据..."
+msgid "The following parameters will only take effect during installation or upgrade:"
+msgstr "以下参数只在安装或者升级时才会生效："
+msgid "Status"
+msgstr "状态"
+
+msgid "Nextcloud is running"
+msgstr "Nextcloud 运行中"
+
+msgid "Nextcloud is not running"
+msgstr "Nextcloud 未运行"
+
+msgid "Open Nextcloud"
+msgstr "打开 Nextcloud"
diff --git a/applications/luci-app-nextcloud/root/etc/config/nextcloud b/applications/luci-app-nextcloud/root/etc/config/nextcloud
index 501747e..d15234a 100644
--- a/applications/luci-app-nextcloud/root/etc/config/nextcloud
+++ b/applications/luci-app-nextcloud/root/etc/config/nextcloud
@@ -1,3 +1,3 @@
config nextcloud
option 'port' '8082'
- option 'enabled' '1'
+ option 'config_path' '/root/nextcloud/config'
diff --git a/applications/luci-app-nextcloud/root/etc/uci-defaults/luci-app-nextcloud b/applications/luci-app-nextcloud/root/etc/uci-defaults/luci-app-nextcloud
new file mode 100644
index 0000000..75bf83d
--- /dev/null
+++ b/applications/luci-app-nextcloud/root/etc/uci-defaults/luci-app-nextcloud
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+config_dir=`uci -q get nextcloud.@nextcloud[0].config_path`
+
+data_dir=`docker inspect --format '{{.Mounts}}' nextcloud | grep -Eom1 '[^ ]+/_data /var/www/html local true ' | cut -d' ' -f1`
+
+if [ -n "$data_dir" -a "$data_dir" != "$config_dir" ]; then
+ uci -q batch <<-EOF >/dev/null
+ set nextcloud.@nextcloud[0].config_path="$data_dir"
+ commit nextcloud
+EOF
+fi
+
+exit 0
diff --git a/applications/luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh b/applications/luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh
new file mode 100755
index 0000000..5f5e149
--- /dev/null
+++ b/applications/luci-app-nextcloud/root/usr/libexec/istorec/nextcloud.sh
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+ACTION=${1}
+shift 1
+
+get_image() {
+ IMAGE_NAME="nextcloud"
+}
+
+do_install() {
+ get_image
+ echo "docker pull ${IMAGE_NAME}"
+ docker pull ${IMAGE_NAME}
+ docker rm -f nextcloud
+
+ do_install_detail
+}
+
+do_install_detail() {
+ local config=`uci get nextcloud.@nextcloud[0].config_path 2>/dev/null`
+ local port=`uci get nextcloud.@nextcloud[0].port 2>/dev/null`
+
+ if [ -z "$config" ]; then
+ echo "config path is empty!"
+ exit 1
+ fi
+
+ [ -z "$port" ] && port=8082
+
+ local cmd="docker run --restart=unless-stopped -d \
+ -v \"$config:/var/www/html\" \
+ --dns=172.17.0.1 \
+ -p $port:80 "
+
+ cmd="$cmd -v /mnt:/mnt"
+ mountpoint -q /mnt && cmd="$cmd:rslave"
+
+ local tz="`cat /tmp/TZ`"
+ [ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
+
+ cmd="$cmd --name nextcloud \"$IMAGE_NAME\""
+
+ echo "$cmd"
+ eval "$cmd"
+
+}
+
+usage() {
+ echo "usage: $0 sub-command"
+ echo "where sub-command is one of:"
+ echo " install Install the nextcloud"
+ echo " upgrade Upgrade the nextcloud"
+ echo " rm/start/stop/restart Remove/Start/Stop/Restart the nextcloud"
+ echo " status Nextcloud status"
+ echo " port Nextcloud port"
+}
+
+case ${ACTION} in
+ "install")
+ do_install
+ ;;
+ "upgrade")
+ do_install
+ ;;
+ "rm")
+ docker rm -f nextcloud
+ ;;
+ "start" | "stop" | "restart")
+ docker ${ACTION} nextcloud
+ ;;
+ "status")
+ docker ps --all -f 'name=nextcloud' --format '{{.State}}'
+ ;;
+ "port")
+ docker ps --all -f 'name=nextcloud' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
+ ;;
+ *)
+ usage
+ exit 1
+ ;;
+esac
diff --git a/applications/luci-app-nextcloud/root/usr/share/nextcloud/install.sh b/applications/luci-app-nextcloud/root/usr/share/nextcloud/install.sh
deleted file mode 100755
index 55e37a1..0000000
--- a/applications/luci-app-nextcloud/root/usr/share/nextcloud/install.sh
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-# Author Xiaobao(xiaobao@linkease.com)
-
-ACTION=${1}
-WRLOCK=/var/lock/nextcloud.lock
-LOGFILE=/var/log/nextcloud.log
-LOGEND="XU6J03M6"
-shift 1
-
-IMAGE_NAME='nextcloud'
-
-check_params() {
-
- if [ -z "${WRLOCK}" ]; then
- echo "lock file not found"
- exit 1
- fi
-
- if [ -z "${LOGFILE}" ]; then
- echo "logger file not found"
- exit 1
- fi
-
-}
-
-lock_run() {
- local lock="$WRLOCK"
- exec 300>$lock
- flock -n 300 || return
- do_run
- flock -u 300
- return
-}
-
-run_action() {
- if check_params; then
- lock_run
- fi
-}
-
-do_install() {
- echo "docker pull ${IMAGE_NAME}" >${LOGFILE}
- docker pull ${IMAGE_NAME} >>${LOGFILE} 2>&1
- docker rm -f nextcloud
-
- local port=`uci get nextcloud.@nextcloud[0].port 2>/dev/null`
- if [ -z "${port}" ]; then
- port=8082
- fi
-
- local mntv="/mnt:/mnt"
- mountpoint -q /mnt && mntv="$mntv:rslave"
-
- docker run -d \
- --name nextcloud \
- --dns=172.17.0.1 \
- --restart=unless-stopped \
- -p ${port}:80 \
- -v /mnt:/mnt:rslave \
- -e TZ="Asia/Shanghai" \
- ${IMAGE_NAME} >>${LOGFILE} 2>&1
-
- RET=$?
- if [ "${RET}" = "0" ]; then
- # mark END, remove the log file
- echo ${LOGEND} >> ${LOGFILE}
- sleep 5
- rm -f ${LOGFILE}
- else
- # reserve the log
- echo "docker run ${IMAGE_NAME} failed" >>${LOGFILE}
- echo ${LOGEND} >> ${LOGFILE}
- fi
- exit ${RET}
-}
-
-# run in lock
-do_run() {
- case ${ACTION} in
- "install")
- do_install
- ;;
- "upgrade")
- do_install
- ;;
- esac
-}
-
-usage() {
- echo "usage: nextcloud sub-command"
- echo "where sub-command is one of:"
- echo " install Install the nextcloud"
- echo " upgrade Upgrade the nextcloud"
- echo " remove Remove the nextcloud"
-}
-
-case ${ACTION} in
- "install")
- run_action
- ;;
- "upgrade")
- run_action
- ;;
- "remove")
- docker rm -f nextcloud
- ;;
- *)
- usage
- ;;
-esac
-