first commit
commit
8cfc520710
@ -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
|
@ -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
|
@ -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:") .. ' <a href=\"https://github.com/simplex-chat/\" target=\"_blank\">https://github.com/simplex-chat/</a>')
|
||||||
|
|
||||||
|
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").."<b>*</b>")
|
||||||
|
o.rmempty = false
|
||||||
|
o.default = "5223"
|
||||||
|
o.datatype = "port"
|
||||||
|
|
||||||
|
o = s:option(Value, "image_name", translate("Wireguard IP Address").."<b>*</b>")
|
||||||
|
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").."<b>*</b>")
|
||||||
|
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
|
@ -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
|
@ -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"
|
||||||
|
-%>
|
||||||
|
<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"><%:simplex is running%></button>
|
||||||
|
<% else %>
|
||||||
|
<button class="cbi-button cbi-button-negative" disabled="true"><%:simplex is not running%></button>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<%
|
||||||
|
if container_running then
|
||||||
|
local port=util.trim(util.exec("/usr/libexec/apps/simplex/simplex.sh port"))
|
||||||
|
if port == "" then
|
||||||
|
port="5223"
|
||||||
|
end
|
||||||
|
-%>
|
||||||
|
<div class="cbi-value cbi-value-last">
|
||||||
|
<label class="cbi-value-title"> </label>
|
||||||
|
<div class="cbi-value-field">
|
||||||
|
|
||||||
|
<input type="button" class="btn cbi-button cbi-button-apply" name="start" value="<%:Open simplex%>" onclick="window.open('http://'+location.hostname+':<%=port%>/', '_blank')">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
@ -0,0 +1,5 @@
|
|||||||
|
config simplex
|
||||||
|
option 'port' '5223'
|
||||||
|
option 'config_path' '/opt/docker2/compose'
|
||||||
|
option 'image_name' '1.2.3.4'
|
||||||
|
|
@ -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
|
@ -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
|
@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
"luci-app-simplex": {
|
||||||
|
"description": "Grant UCI access for luci-app-simplex",
|
||||||
|
"read": {
|
||||||
|
"uci": [ "simplex" ]
|
||||||
|
},
|
||||||
|
"write": {
|
||||||
|
"uci": [ "simplex" ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue