commit 8aec49f1aa0903d4ef68c132b5d5a2dd6d9838df Author: ben Date: Fri Sep 8 06:16:37 2023 -0400 first commit diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..39793a7 --- /dev/null +++ b/Makefile @@ -0,0 +1,16 @@ + + +include $(TOPDIR)/rules.mk + + +LUCI_TITLE:=LuCI support for webtop +LUCI_PKGARCH:=all +LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd + +define Package/luci-app-webtop/conffiles +/etc/config/webtop +endef + +include $(TOPDIR)/feeds/luci/luci.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/README.md b/README.md new file mode 100644 index 0000000..e69de29 diff --git a/luasrc/controller/webtop.lua b/luasrc/controller/webtop.lua new file mode 100755 index 0000000..b2c1333 --- /dev/null +++ b/luasrc/controller/webtop.lua @@ -0,0 +1,15 @@ + +module("luci.controller.webtop", package.seeall) + +function index() + entry({"admin", "apps"}, firstchild(), _("Apps") , 45).dependent = false + if not nixio.fs.access("/etc/config/webtop") then + return + end + + local page = entry({"admin", "apps", "webtop"}, cbi("webtop"), _("webtop")) + page.order = 10 + page.dependent = true + page.acl_depends = { "luci-app-webtop" } + entry({"admin","apps","webtop","status"},call("act_status")).leaf=true +end diff --git a/luasrc/model/cbi/webtop.lua b/luasrc/model/cbi/webtop.lua new file mode 100644 index 0000000..6bb5ec5 --- /dev/null +++ b/luasrc/model/cbi/webtop.lua @@ -0,0 +1,67 @@ +--[[ +LuCI - Lua Configuration Interface +]]-- + +local taskd = require "luci.model.tasks" +local webtop_model = require "luci.model.webtop" +local m, s, o + +m = taskd.docker_map("webtop", "webtop", "/usr/libexec/apps/webtop/webtop.sh", + translate("webtop"), + translate("Get Virtual Desktops of all flavors, Alpine, Ubuntu, Fedora, and Arch based containers containing full desktop environments in officially supported versions accessible via any modern web browser.") + .. translate("Official website:") .. ' hhttps://docs.linuxserver.io/images/docker-webtop/') + +s = m:section(SimpleSection, translate("Service Status"), translate("webtop status:")) +s:append(Template("webtop/status")) + +s = m:section(TypedSection, "webtop", translate("Setup"), translate("The following parameters will only take effect during installation or upgrade:")) +s.addremove=false +s.anonymous=true + +o = s:option(Value, "port", translate("Port").."*") +o.rmempty = false +o.default = "3000" +o.datatype = "port" + +o = s:option(Value, "image_name", translate("Image").."*") +o.rmempty = false +o.datatype = "string" +o:value("fedora-xfce", "fedora-xfce") +o:value("arch-xfce", "arch-xfce") +o:value("alpine-kde", "alpine-kde") +o:value("ubuntu-kde", "ubuntu-kde") +o:value("fedora-kde", "fedora-kde") +o:value("arch-kde", "arch-kde") +o:value("alpine-mate", "alpine-mate") +o:value("ubuntu-mate", "ubuntu-mate") +o:value("alpine-i3", "alpine-i3") +o:value("ubuntu-i3", "ubuntu-i3") +o:value("fedora-i3", "fedora-i3") +o:value("arch-i3", "arch-i3") +o:value("alpine-openbox", "alpine-openbox") +o:value("ubuntu-openbox", "ubuntu-openbox") +o:value("fedora-openbox", "fedora-openbox") +o:value("arch-openbox", "arch-openbox") +o:value("alpine-icewm", "alpine-icewm") +o:value("ubuntu-icewm", "ubuntu-icewm") +o:value("fedora-icewm", "fedora-icewm") +o:value("arch-icewm", "arch-icewm") +o.default = "ubuntu-xfce" + +local blocks = webtop_model.blocks() +local home = webtop_model.home() + +o = s:option(Value, "config_path", translate("Config path").."*") +o.rmempty = false +o.datatype = "string" +o:value("/opt/docker2/compose/Config", "/opt/docker2/compose/Config") +o:value("/mnt/data", "/mnt/data") +o.default = "/opt/docker2/compose/webtop/Config" + +local paths, default_path = webtop_model.find_paths(blocks, home, "Configs") +for _, val in pairs(paths) do + o:value(val, val) +end +o.default = default_path + +return m diff --git a/luasrc/model/webtop.lua b/luasrc/model/webtop.lua new file mode 100644 index 0000000..769bfb4 --- /dev/null +++ b/luasrc/model/webtop.lua @@ -0,0 +1,55 @@ +local util = require "luci.util" +local jsonc = require "luci.jsonc" + +local webtop = {} + +webtop.blocks = function() + local f = io.popen("lsblk -s -f -b -o NAME,FSSIZE,MOUNTPOINT --json", "r") + local vals = {} + if f then + local ret = f:read("*all") + f:close() + local obj = jsonc.parse(ret) + for _, val in pairs(obj["blockdevices"]) do + local fsize = val["fssize"] + if fsize ~= nil and string.len(fsize) > 10 and val["mountpoint"] then + -- fsize > 1G + vals[#vals+1] = val["mountpoint"] + end + end + end + return vals +end + +webtop.home = function() + local uci = require "luci.model.uci".cursor() + local home_dirs = {} + home_dirs["main_dir"] = uci:get_first("quickstart", "main", "main_dir", "/root") + home_dirs["Configs"] = uci:get_first("quickstart", "main", "conf_dir", home_dirs["main_dir"].."/Configs") + home_dirs["Public"] = uci:get_first("quickstart", "main", "pub_dir", home_dirs["main_dir"].."/Public") + home_dirs["Downloads"] = uci:get_first("quickstart", "main", "dl_dir", home_dirs["Public"].."/Downloads") + home_dirs["Caches"] = uci:get_first("quickstart", "main", "tmp_dir", home_dirs["main_dir"].."/Caches") + return home_dirs +end + +webtop.find_paths = function(blocks, home_dirs, path_name) + local default_path = '' + local configs = {} + + default_path = home_dirs[path_name] .. "/webtop" + if #blocks == 0 then + table.insert(configs, default_path) + else + for _, val in pairs(blocks) do + table.insert(configs, val .. "/" .. path_name .. "/webtop") + end + local without_conf_dir = "/root/" .. path_name .. "/webtop" + if default_path == without_conf_dir then + default_path = configs[1] + end + end + + return configs, default_path +end + +return webtop diff --git a/luasrc/view/webtop/status.htm b/luasrc/view/webtop/status.htm new file mode 100644 index 0000000..d09dfe4 --- /dev/null +++ b/luasrc/view/webtop/status.htm @@ -0,0 +1,31 @@ +<% +local util = require "luci.util" +local container_status = util.trim(util.exec("/usr/libexec/apps/webtop/webtop.sh status")) +local container_install = (string.len(container_status) > 0) +local container_running = container_status == "running" +-%> +
+ +
+ <% if container_running then %> + + <% else %> + + <% end %> +
+
+<% +if container_running then + local port=util.trim(util.exec("/usr/libexec/apps/webtop/webtop.sh port")) + if port == "" then + port="3000" + end +-%> +
+ +
+ + +
+
+<% end %> diff --git a/root/etc/config/webtop b/root/etc/config/webtop new file mode 100644 index 0000000..0980e34 --- /dev/null +++ b/root/etc/config/webtop @@ -0,0 +1,4 @@ +config webtop + option 'port' '3000' + option 'config_path' '/opt/docker2/Config/webtop' + option 'image_name' 'ubuntu-xfce' diff --git a/root/etc/uci-defaults/luci-app-webtop b/root/etc/uci-defaults/luci-app-webtop new file mode 100644 index 0000000..55a6782 --- /dev/null +++ b/root/etc/uci-defaults/luci-app-webtop @@ -0,0 +1,14 @@ +#!/bin/sh + +config_dir=`uci -q get webtop.@webtop[0].config_path` + +data_dir=`docker inspect --format '{{.Mounts}}' webtop | 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 webtop.@webtop[0].config_path="$data_dir" + commit webtop +EOF +fi + +exit 0 diff --git a/root/usr/libexec/apps/webtop/webtop.sh b/root/usr/libexec/apps/webtop/webtop.sh new file mode 100755 index 0000000..42b5425 --- /dev/null +++ b/root/usr/libexec/apps/webtop/webtop.sh @@ -0,0 +1,107 @@ +#!/bin/sh + +ACTION=${1} +shift 1 + +get_image() { + IMAGE_NAME="latest" +} + +do_install_detail() { + local config=`uci get webtop.@webtop[0].config_path 2>/dev/null` + local port=`uci get webtop.@webtop[0].port 2>/dev/null` + local IMAGE_NAME=`uci get webtop.@webtop[0].image_name 2>/dev/null` + + #Generate the generic environment variables for the docker-compose + + GEN_PASS=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo) + GEN_PASS2=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo) + + # Get our local LAN IP Address + LAN_IP=$(uci get network.lan.ipaddr) + # Strip trailing network mask + LAN_IP="${LAN_IP%/*}" + + if [ -z "$config" ]; then + echo "config path is empty!" + exit 1 + fi + + [ -z "$port" ] && port=3000 + [ -z "$IMAGE_NAME" ] && IMAGE_NAME=latest + + + # Create Docker Compose file with custom variables + + # Create Docker Compose file with custom variables +touch docker-compose.yml +cat > docker-compose.yml <