zhao/luci-app-alist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci: enable SSL protocol support & format code

Browse Source
This commit is contained in:
sbwml 2022-03-07 17:55:31 +08:00
parent 0030bc0f24
commit e2fd8f52ad
6 changed files with 75 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
alist/files/alist.config
View File

@ -4,3 +4,4 @@ config alist
option 'expiration' '60'
option 'cleanup_interval' '120'
option 'temp_dir' '/tmp'
option 'ssl' '0'

10
alist/files/alist.init
View File

@ -11,6 +11,9 @@ get_config() {
config_get expiration $1 expiration 60
config_get cleanup_interval $1 cleanup_interval 120
config_get temp_dir $1 temp_dir "/tmp"
config_get ssl $1 ssl 0
config_get ssl_cert $1 ssl_cert ""
config_get ssl_key $1 ssl_key ""
}
start_service() {
@ -18,8 +21,13 @@ start_service() {
config_foreach get_config alist
[ $enabled != 1 ] && return 1
mkdir -p $temp_dir
if [ "$ssl" -eq 1 ];then
SSL=true
else
SSL=false
fi
cat > $CONFIG <<EOF
{"address":"0.0.0.0","port":$port,"assets":"/","database":{"type":"sqlite3","user":"","password":"","host":"","port":0,"name":"","table_prefix":"x_","db_file":"/etc/alist/data.db","ssl_mode":"disable"},"scheme":{"https":false,"cert_file":"","key_file":""},"cache":{"expiration":$expiration,"cleanup_interval":$cleanup_interval},"temp_dir":"$temp_dir"}
{"address":"0.0.0.0","port":$port,"assets":"/","database":{"type":"sqlite3","user":"","password":"","host":"","port":0,"name":"","table_prefix":"x_","db_file":"/etc/alist/data.db","ssl_mode":"disable"},"scheme":{"https":$SSL,"cert_file":"$ssl_cert","key_file":"$ssl_key"},"cache":{"expiration":$expiration,"cleanup_interval":$cleanup_interval},"temp_dir":"$temp_dir"}
EOF
procd_open_instance
procd_set_param command $PROG

2
luci-app-alist/Makefile
View File

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI support for alist
LUCI_DEPENDS:=+alist
LUCI_PKGARCH:=all
PKG_VERSION:=1.0.2
PKG_VERSION:=1.0.3
PKG_RELEASE:=1
include $(TOPDIR)/feeds/luci/luci.mk

47
luci-app-alist/luasrc/model/cbi/alist.lua
View File

@ -4,19 +4,44 @@ m = Map("alist", translate("Alist"), translate("Alist is an file list program th
m:section(SimpleSection).template = "alist_status"
s=m:section(TypedSection, "alist", translate("Global settings"))
s.addremove=false
s.anonymous=true
s = m:section(TypedSection, "alist", translate("Global settings"))
s.addremove = false
s.anonymous = true
s:option(Flag, "enabled", translate("Enable")).rmempty=false
s:option(Value, "port", translate("Port")).rmempty=false
o = s:option(Flag, "enabled", translate("Enable"))
o.rmempty = false
s=m:section(TypedSection, "alist", translate("Cache settings"))
s.addremove=false
s.anonymous=true
o = s:option(Value, "port", translate("Port"))
o.datatype = "and(port,min(1))"
o.rmempty = false
s:option(Value, "expiration", translate("Cache invalidation time (unit: minutes)")).rmempty=false
s:option(Value, "cleanup_interval", translate("Clear the invalidation cache interval")).rmempty=false
s:option(Value, "temp_dir", translate("Temp directory")).rmempty=false
o = s:option(Flag, "ssl", translate("Enable SSL"))
o.rmempty=false
o = s:option(Value,"ssl_cert", translate("SSL cert"), translate("SSL certificate file path"))
o:depends("ssl", "1")
o.datatype = "string"
o.rmempty = true
o = s:option(Value,"ssl_key", translate("SSL key"), translate("SSL key file path"))
o:depends("ssl", "1")
o.datatype = "string"
o.rmempty = true
s = m:section(TypedSection, "alist", translate("Cache settings"))
s.addremove = false
s.anonymous = true
o = s:option(Value, "expiration", translate("Cache invalidation time (unit: minutes)"))
o.datatype = "and(uinteger,min(1))"
o.rmempty = false
o = s:option(Value, "cleanup_interval", translate("Clear the invalidation cache interval (unit: minutes)"))
o.datatype = "and(uinteger,min(1))"
o.rmempty = false
o = s:option(Value, "temp_dir", translate("Temp directory"))
o.datatype = "string"
o.rmempty = false
return m

12
luci-app-alist/luasrc/view/alist_status.htm
View File

@ -1,3 +1,13 @@
<%
local uci = require 'luci.model.uci'.cursor()
ssl = uci:get_first('alist', 'alist', 'ssl')
if ssl == '1' then
protocol="https://"
else
protocol="http://"
end
%>
<script type="text/javascript">//<![CDATA[
XHR.poll(5, '<%=url("admin/nas/alist_status")%>', null,
function(x, st)
@ -7,7 +17,7 @@
{
if (st.running)
{
tb.innerHTML = '<em style=\"color:green\"><b><%:The Alist service is running.%></b></em>' + "<input class=\"cbi-button-reload mar-10\" type=\"button\" value=\" <%:Click to open Alist%> \" onclick=\"window.open('http://" + window.location.hostname + ":" + st.port + "/')\"/>";
tb.innerHTML = '<em style=\"color:green\"><b><%:The Alist service is running.%></b></em>' + "<input class=\"cbi-button-reload mar-10\" type=\"button\" value=\" <%:Click to open Alist%> \" onclick=\"window.open('<%=protocol%>" + window.location.hostname + ":" + st.port + "/')\"/>";
}
else
{

19
luci-app-alist/po/zh_Hans/alist.po
View File

@ -16,14 +16,29 @@ msgstr "全局设置"
msgid "Port"
msgstr "端口"
msgid "Enable SSL"
msgstr "启用 SSL"
msgid "SSL cert"
msgstr "SSL 证书"
msgid "SSL certificate file path"
msgstr "SSL 证书文件路径"
msgid "SSL key"
msgstr "SSL 密钥"
msgid "SSL key file path"
msgstr "SSL 密钥文件路径"
msgid "Cache settings"
msgstr "缓存设置"
msgid "Cache invalidation time (unit: minutes)"
msgstr "缓存失效时间（分钟）"
msgid "Clear the invalidation cache interval"
msgstr "清理失效缓存间隔"
msgid "Clear the invalidation cache interval (unit: minutes)"
msgstr "清理失效缓存间隔（分钟）"
msgid "Temp directory"
msgstr "临时目录"