first commit

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

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

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:") .. ' <a href=\"https://docs.linuxserver.io/images/docker-webtop\" target=\"_blank\">hhttps://docs.linuxserver.io/images/docker-webtop/</a>')
+
+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").."<b>*</b>")
+o.rmempty = false
+o.default = "3000"
+o.datatype = "port"
+
+o = s:option(Value, "image_name", translate("Image").."<b>*</b>")
+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").."<b>*</b>")
+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

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

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"
+-%>
+<div class="cbi-value">
+    <label class="cbi-value-title"><%:Status%></label>
+    <div class="cbi-value-field">
+        <% if container_running then %>
+        <button class="cbi-button cbi-button-success" disabled="true"><%:webtop is running%></button>
+        <% else %>
+        <button class="cbi-button cbi-button-negative" disabled="true"><%:webtop is not running%></button>
+        <% end %>
+    </div>
+</div>
+<%
+if container_running then
+    local port=util.trim(util.exec("/usr/libexec/apps/webtop/webtop.sh port"))
+    if port == "" then
+        port="3000"
+    end
+-%>
+<div class="cbi-value cbi-value-last">
+    <label class="cbi-value-title">&nbsp;</label>
+    <div class="cbi-value-field">
+
+    <input type="button" class="btn cbi-button cbi-button-apply" name="start" value="<%:Open webtop%>" onclick="window.open('http://'+location.hostname+':<%=port%>/', '_blank')">
+    </div>
+</div>
+<% end %>

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'

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

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 <<EOF
+version: "2.1"
+services:
+  webtop:
+    image: lscr.io/linuxserver/webtop:${IMAGE_NAME}
+    container_name: webtop
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Etc/UTC
+    volumes:
+      - ${config}:/config
+    ports:
+      - ${port}:3000
+    shm_size: "1gb" #optional
+    restart: unless-stopped
+    labels:
+      plugsy.name: "WebTop"
+      plugsy.category: "Home"
+      plugsy.icon: "@styled-icons/icomoon/Windows"
+      plugsy.link: "http://${LAN_IP}:${port}"
+EOF
+  
+  docker-compose up -d
+ 
+  # Add a new list option to the "shortcutmenu" configuration file
+  uci add shortcutmenu lists
+  uci set shortcutmenu.@lists[-1].webname="$IMAGE_NAME"
+  uci set shortcutmenu.@lists[-1].weburl="$LAN_IP:$port"
+  uci set shortcutmenu.@lists[-1].webpath="/"
+  uci commit shortcutmenu
+
+}
+
+usage() {
+  echo "usage: $0 sub-command"
+  echo "where sub-command is one of:"
+  echo "      install                Install webtop"
+  echo "      upgrade                Upgrade webtop"
+  echo "      rm/start/stop/restart  Remove/Start/Stop/Restart webtop"
+  echo "      status                 webtop status"
+  echo "      port                   webtop port"
+}
+
+case ${ACTION} in
+  "install")
+    get_image
+    do_install_detail
+  ;;
+  "upgrade")
+    get_image
+    do_install_detail
+  ;;
+  "rm")
+    docker rm -f webtop
+  ;;
+  "start" | "stop" | "restart")
+    docker ${ACTION} webtop
+  ;;
+  "status")
+    docker ps --all -f 'name=webtop' --format '{{.State}}'
+  ;;
+  "port")
+    docker ps --all -f 'name=webtop' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
+  ;;
+  *)
+    usage
+    exit 1
+  ;;
+esac

root/usr/share/rpcd/acl.d/luci-app-webtop.json

@@ -0,0 +1,11 @@
+{
+	"luci-app-webtop": {
+		"description": "Grant UCI access for luci-app-webtop",
+		"read": {
+			"uci": [ "webtop" ]
+		},
+		"write": {
+			"uci": [ "webtop" ]
+		}
+	}
+}