From 8cfc520710dc7452bf1ae90545dbfe097a0e5679 Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 3 Sep 2023 05:00:40 +0000 Subject: [PATCH] first commit --- Makefile | 16 +++ README.md | 0 luasrc/controller/simplex.lua | 15 +++ luasrc/model/cbi/simplex.lua | 47 ++++++++ luasrc/model/simplex.lua | 55 +++++++++ luasrc/view/simplex/status.htm | 31 +++++ root/etc/config/simplex | 5 + root/etc/uci-defaults/luci-app-simplex | 14 +++ root/usr/libexec/apps/simplex/simplex.sh | 107 ++++++++++++++++++ .../share/rpcd/acl.d/luci-app-simplex.json | 11 ++ 10 files changed, 301 insertions(+) create mode 100644 Makefile create mode 100644 README.md create mode 100644 luasrc/controller/simplex.lua create mode 100644 luasrc/model/cbi/simplex.lua create mode 100644 luasrc/model/simplex.lua create mode 100644 luasrc/view/simplex/status.htm create mode 100644 root/etc/config/simplex create mode 100644 root/etc/uci-defaults/luci-app-simplex create mode 100644 root/usr/libexec/apps/simplex/simplex.sh create mode 100644 root/usr/share/rpcd/acl.d/luci-app-simplex.json diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..131ae6e --- /dev/null +++ b/Makefile @@ -0,0 +1,16 @@ + + +include $(TOPDIR)/rules.mk + + +LUCI_TITLE:=LuCI support for simplex +LUCI_PKGARCH:=all +LUCI_DEPENDS:=+lsblk +docker +luci-lib-taskd + +define Package/luci-app-simplex/conffiles +/etc/config/simplex +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/simplex.lua b/luasrc/controller/simplex.lua new file mode 100644 index 0000000..7d9f1c6 --- /dev/null +++ b/luasrc/controller/simplex.lua @@ -0,0 +1,15 @@ + +module("luci.controller.simplex", package.seeall) + +function index() + entry({"admin", "apps"}, firstchild(), _("Apps") , 45).dependent = false + if not nixio.fs.access("/etc/config/simplex") then + return + end + + local page = entry({"admin", "apps", "simplex"}, cbi("simplex"), _("simplex")) + page.order = 10 + page.dependent = true + page.acl_depends = { "luci-app-simplex" } + entry({"admin","apps","simplex","status"},call("act_status")).leaf=true +end diff --git a/luasrc/model/cbi/simplex.lua b/luasrc/model/cbi/simplex.lua new file mode 100644 index 0000000..9ff7549 --- /dev/null +++ b/luasrc/model/cbi/simplex.lua @@ -0,0 +1,47 @@ +--[[ +LuCI - Lua Configuration Interface +]]-- + +local taskd = require "luci.model.tasks" +local simplex_model = require "luci.model.simplex" +local m, s, o + +m = taskd.docker_map("simplex", "simplex", "/usr/libexec/apps/simplex/simplex.sh", + translate("simplex"), + translate("The first messaging platform that has no user identifiers of any kind - 100% private by design.") + .. translate("Official website:") .. ' https://github.com/simplex-chat/') + +s = m:section(SimpleSection, translate("Service Status"), translate("simplex status:")) +s:append(Template("simplex/status")) + +s = m:section(TypedSection, "simplex", translate("Setup"), translate("Requires Wireguard with internal and external ports 5223 port forward.")) +s.addremove=false +s.anonymous=true + +o = s:option(Value, "port", translate("Port").."*") +o.rmempty = false +o.default = "5223" +o.datatype = "port" + +o = s:option(Value, "image_name", translate("Wireguard IP Address").."*") +o.rmempty = false +o.datatype = "string" +o:value("1.2.3.4", "1.2.3.4") +o.default = "1.2.3.4" + +local blocks = simplex_model.blocks() +local home = simplex_model.home() + +o = s:option(Value, "config_path", translate("Simplex config path").."*") +o.rmempty = false +o.datatype = "string" +o:value("/opt/docker2/compose/", "/opt/docker2/compose/") +o.default = "/opt/docker2/compose/" + +local paths, default_path = simplex_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/simplex.lua b/luasrc/model/simplex.lua new file mode 100644 index 0000000..cb6aa4c --- /dev/null +++ b/luasrc/model/simplex.lua @@ -0,0 +1,55 @@ +local util = require "luci.util" +local jsonc = require "luci.jsonc" + +local simplex = {} + +simplex.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 + +simplex.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 + +simplex.find_paths = function(blocks, home_dirs, path_name) + local default_path = '' + local configs = {} + + default_path = home_dirs[path_name] .. "/simplex" + if #blocks == 0 then + table.insert(configs, default_path) + else + for _, val in pairs(blocks) do + table.insert(configs, val .. "/" .. path_name .. "/simplex") + end + local without_conf_dir = "/root/" .. path_name .. "/simplex" + if default_path == without_conf_dir then + default_path = configs[1] + end + end + + return configs, default_path +end + +return simplex diff --git a/luasrc/view/simplex/status.htm b/luasrc/view/simplex/status.htm new file mode 100644 index 0000000..b6cfdbd --- /dev/null +++ b/luasrc/view/simplex/status.htm @@ -0,0 +1,31 @@ +<% +local util = require "luci.util" +local container_status = util.trim(util.exec("/usr/libexec/apps/simplex/simplex.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/simplex/simplex.sh port")) + if port == "" then + port="5223" + end +-%> +
+ +
+ + +
+
+<% end %> diff --git a/root/etc/config/simplex b/root/etc/config/simplex new file mode 100644 index 0000000..1879790 --- /dev/null +++ b/root/etc/config/simplex @@ -0,0 +1,5 @@ +config simplex + option 'port' '5223' + option 'config_path' '/opt/docker2/compose' + option 'image_name' '1.2.3.4' + diff --git a/root/etc/uci-defaults/luci-app-simplex b/root/etc/uci-defaults/luci-app-simplex new file mode 100644 index 0000000..22868dd --- /dev/null +++ b/root/etc/uci-defaults/luci-app-simplex @@ -0,0 +1,14 @@ +#!/bin/sh + +config_dir=`uci -q get simplex.@simplex[0].config_path` + +data_dir=`docker inspect --format '{{.Mounts}}' simplex | 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 simplex.@simplex[0].config_path="$data_dir" + commit simplex +EOF +fi + +exit 0 diff --git a/root/usr/libexec/apps/simplex/simplex.sh b/root/usr/libexec/apps/simplex/simplex.sh new file mode 100644 index 0000000..b2ed993 --- /dev/null +++ b/root/usr/libexec/apps/simplex/simplex.sh @@ -0,0 +1,107 @@ +#!/bin/sh + +ACTION=${1} +shift 1 + +get_image() { + GEN_PASS=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo) +} + +do_install_detail() { + local config=`uci get simplex.@simplex[0].config_path 2>/dev/null` + local port=`uci get simplex.@simplex[0].port 2>/dev/null` + local IMAGE_NAME=`uci get simplex.@simplex[0].image_name 2>/dev/null` + local username=`uci get simplex.@simplex[0].username 2>/dev/null` + local password=`uci get simplex.@simplex[0].password 2>/dev/null` + + #Generate the generic environment variables for the docker-compose + + + + # 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=5223 + +echo "Removing Previous Simplex SMP server" + rm -R $config/simplex/ + +echo "installing Simplex SMP server" + mkdir -p $config/simplex/{config,logs} + +echo "Generating Simplex SMP password..." + GEN_PASS2=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo) + +docker run -d \ + --name simplex-smp \ + -e "addr=$IMAGE_NAME" \ + -e "pass=$GEN_PASS2" \ + -p $port:5223 \ + -v /opt/docker2/compose/simplex/config:/etc/opt/simplex:z \ + -v /opt/docker2/compose/simplex/logs:/var/opt/simplex:z \ + simplexchat/simplexmq:latest + +sleep 4 + +address=$(grep "Server address:" $config/simplex/logs/smp-server.log | sed "s/Server address: //") + +echo "***********************************************************" +echo "Your SMP server address is:" +echo $address +echo "***********************************************************" +echo "*Copy the server address now and save for use with Simplex*" +echo "***********************************************************" +sleep 1 +echo "This local log file will now be deleted." +sleep 1 +rm $config/simplex/logs/smp-server.log +echo "Done." +sleep 1 +echo "Make sure to forward internal port $port and external port 5223" +echo "on TorGuard WireGuard (Private VPN Cloud)" + +} + +usage() { + echo "usage: $0 sub-command" + echo "where sub-command is one of:" + echo " install Install simplex" + echo " upgrade Upgrade simplex" + echo " rm/start/stop/restart Remove/Start/Stop/Restart simplex" + echo " status simplex status" + echo " port simplex port" +} + +case ${ACTION} in + "install") + get_image + do_install_detail + ;; + "upgrade") + get_image + do_install_detail + ;; + "rm") + docker rm -f simplex + ;; + "start" | "stop" | "restart") + docker ${ACTION} simplex + ;; + "status") + docker ps --all -f 'name=simplex' --format '{{.State}}' + ;; + "port") + docker ps --all -f 'name=simplex' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://' + ;; + *) + usage + exit 1 + ;; +esac diff --git a/root/usr/share/rpcd/acl.d/luci-app-simplex.json b/root/usr/share/rpcd/acl.d/luci-app-simplex.json new file mode 100644 index 0000000..cd2c19f --- /dev/null +++ b/root/usr/share/rpcd/acl.d/luci-app-simplex.json @@ -0,0 +1,11 @@ +{ + "luci-app-simplex": { + "description": "Grant UCI access for luci-app-simplex", + "read": { + "uci": [ "simplex" ] + }, + "write": { + "uci": [ "simplex" ] + } + } +}