first commit

Makefile

@@ -0,0 +1,16 @@
+
+
+include $(TOPDIR)/rules.mk
+
+
+LUCI_TITLE:=LuCI support for joplin
+LUCI_PKGARCH:=all
+LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd
+
+define Package/luci-app-joplin/conffiles
+/etc/config/joplin
+endef
+
+include $(TOPDIR)/feeds/luci/luci.mk
+
+# call BuildPackage - OpenWrt buildroot signature

luasrc/controller/joplin.lua

@@ -0,0 +1,15 @@
+
+module("luci.controller.joplin", package.seeall)
+
+function index()
+	entry({"admin", "apps"}, firstchild(), _("Apps") , 45).dependent = false
+	if not nixio.fs.access("/etc/config/joplin") then
+		return
+	end
+
+	local page = entry({"admin", "apps", "joplin"}, cbi("joplin"), _("joplin"))
+	page.order = 10
+	page.dependent = true
+	page.acl_depends = { "luci-app-joplin" }
+	entry({"admin","apps","joplin","status"},call("act_status")).leaf=true
+end

luasrc/model/cbi/joplin.lua

@@ -0,0 +1,47 @@
+--[[
+LuCI - Lua Configuration Interface
+]]--
+
+local taskd = require "luci.model.tasks"
+local joplin_model = require "luci.model.joplin"
+local m, s, o
+
+m = taskd.docker_map("joplin", "joplin", "/usr/libexec/apps/joplin/joplin.sh",
+	translate("joplin"),
+	translate("Joplin Server can run in a Docker container on your server or anywhere you want to run it with Docker. Joplin Server will allow you to sync notes from the desktop application and mobile phone applications so you can view, edit or add notes anywhere on the go.")
+		.. translate("Official website:") .. ' <a href=\"https://hub.docker.com/r/florider89/joplin-server/\" target=\"_blank\">https://hub.docker.com/r/florider89/joplin-server/</a>')
+
+s = m:section(SimpleSection, translate("Service Status"), translate("joplin status:"))
+s:append(Template("joplin/status"))
+
+s = m:section(TypedSection, "joplin", 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 = "22300"
+o.datatype = "port"
+
+o = s:option(Value, "image_name", translate("Image").."<b>*</b>")
+o.rmempty = false
+o.datatype = "string"
+o:value("florider89/joplin-server:latest", "florider89/joplin-server:latest")
+o.default = "florider89/joplin-server:latest"
+
+local blocks = joplin_model.blocks()
+local home = joplin_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.default = "/opt/docker2/compose/Config"
+
+local paths, default_path = joplin_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/joplin.lua

@@ -0,0 +1,55 @@
+local util  = require "luci.util"
+local jsonc = require "luci.jsonc"
+
+local joplin = {}
+
+joplin.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
+
+joplin.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
+
+joplin.find_paths = function(blocks, home_dirs, path_name)
+  local default_path = ''
+  local configs = {}
+
+  default_path = home_dirs[path_name] .. "/joplin"
+  if #blocks == 0 then
+    table.insert(configs, default_path)
+  else
+    for _, val in pairs(blocks) do 
+      table.insert(configs, val .. "/" .. path_name .. "/joplin")
+    end
+    local without_conf_dir = "/root/" .. path_name .. "/joplin"
+    if default_path == without_conf_dir then
+      default_path = configs[1]
+    end
+  end
+
+  return configs, default_path
+end
+
+return joplin

luasrc/view/joplin/status.htm

@@ -0,0 +1,31 @@
+<%
+local util  = require "luci.util"
+local container_status = util.trim(util.exec("/usr/libexec/apps/joplin/joplin.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"><%:joplin is running%></button>
+        <% else %>
+        <button class="cbi-button cbi-button-negative" disabled="true"><%:joplin is not running%></button>
+        <% end %>
+    </div>
+</div>
+<%
+if container_running then
+    local port=util.trim(util.exec("/usr/libexec/apps/joplin/joplin.sh port"))
+    if port == "" then
+        port="22300"
+    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 joplin%>" onclick="window.open('http://'+location.hostname+':<%=port%>/', '_blank')">
+    </div>
+</div>
+<% end %>

root/etc/config/joplin

@@ -0,0 +1,4 @@
+config joplin
+	option 'port' '22300'
+	option 'config_path' '/opt/docker2/compose/Config'
+	option 'image_name' 'florider89/joplin-server:latest'

root/etc/uci-defaults/luci-app-joplin

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+config_dir=`uci -q get joplin.@joplin[0].config_path`
+
+data_dir=`docker inspect --format '{{.Mounts}}' joplin | 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 joplin.@joplin[0].config_path="$data_dir"
+        commit joplin
+EOF
+fi
+
+exit 0

root/usr/libexec/apps/joplin/joplin.sh

@@ -0,0 +1,115 @@
+#!/bin/sh
+
+ACTION=${1}
+shift 1
+
+get_image() {
+  IMAGE_NAME="florider89/joplin-server:latest"
+}
+
+do_install_detail() {
+  local config=`uci get joplin.@joplin[0].config_path 2>/dev/null`
+  local port=`uci get joplin.@joplin[0].port 2>/dev/null`
+  local IMAGE_NAME=`uci get joplin.@joplin[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=22300
+  [ -z "$IMAGE_NAME" ] && IMAGE_NAME=florider89/joplin-server: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: '3'
+services:
+    app:
+        environment:
+            - APP_BASE_URL=http://${LAN_IP}:${port}
+            - APP_PORT=${port}
+            - POSTGRES_PASSWORD=${GEN_PASS}
+            - POSTGRES_DATABASE=joplin
+            - POSTGRES_USER=joplin
+            - POSTGRES_PORT=5432
+            - POSTGRES_HOST=db
+            - DB_CLIENT=pg
+        restart: unless-stopped
+        image: florider89/joplin-server:latest
+        ports:
+            - ${port}:22300
+    db:
+        restart: unless-stopped
+        image: postgres:13.1
+        ports:
+            - 5432:5432
+        volumes:
+            - ./data:/var/lib/postgresql/data
+        environment:
+            - POSTGRES_PASSWORD=${GEN_PASS}
+            - POSTGRES_USER=joplin
+            - POSTGRES_DB=joplin
+
+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 joplin"
+  echo "      upgrade                Upgrade joplin"
+  echo "      rm/start/stop/restart  Remove/Start/Stop/Restart joplin"
+  echo "      status                 joplin status"
+  echo "      port                   joplin port"
+}
+
+case ${ACTION} in
+  "install")
+    get_image
+    do_install_detail
+  ;;
+  "upgrade")
+    get_image
+    do_install_detail
+  ;;
+  "rm")
+    docker rm -f joplin
+  ;;
+  "start" | "stop" | "restart")
+    docker ${ACTION} joplin
+  ;;
+  "status")
+    docker ps --all -f 'name=joplin' --format '{{.State}}'
+  ;;
+  "port")
+    docker ps --all -f 'name=joplin' --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-joplin.json

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