[New Features]请求增加 独立 HTTPS 端口 设置 about luci-app-alist HOT 4 CLOSED

From b78bd251a91f8f2cb9f9c35a5b94c1fbc82f4141 Mon Sep 17 00:00:00 2001
From: sbwml <[email protected]>
Date: Mon, 3 Jul 2023 21:52:49 +0800
Subject: [PATCH] luci-app-alist: add https listening port support

---
 luci-app-alist/luasrc/model/cbi/alist/basic.lua | 5 +++++
 luci-app-alist/po/zh-cn/alist.po                | 3 +++
 luci-app-alist/root/etc/init.d/alist            | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/luci-app-alist/luasrc/model/cbi/alist/basic.lua b/luci-app-alist/luasrc/model/cbi/alist/basic.lua
index 5b7723b..1e95832 100644
--- a/luci-app-alist/luasrc/model/cbi/alist/basic.lua
+++ b/luci-app-alist/luasrc/model/cbi/alist/basic.lua
@@ -23,6 +23,11 @@ o.rmempty = false
 o = s:option(Flag, "ssl", translate("Enable SSL"))
 o.rmempty=false
 
+o = s:option(Value, "https_port", translate("HTTPS Port"))
+o.datatype = "and(port,min(1))"
+o.default = "5245"
+o:depends("ssl", "1")
+
 o = s:option(Value,"ssl_cert", translate("SSL cert"), translate("SSL certificate file path"))
 o.datatype = "file"
 o:depends("ssl", "1")
diff --git a/luci-app-alist/po/zh-cn/alist.po b/luci-app-alist/po/zh-cn/alist.po
index 1f996d9..1d625a1 100644
--- a/luci-app-alist/po/zh-cn/alist.po
+++ b/luci-app-alist/po/zh-cn/alist.po
@@ -19,6 +19,9 @@ msgstr "启用"
 msgid "Port"
 msgstr "端口"
 
+msgid "HTTPS Port"
+msgstr "HTTPS 端口"
+
 msgid "Enable SSL"
 msgstr "启用 SSL"
 
diff --git a/luci-app-alist/root/etc/init.d/alist b/luci-app-alist/root/etc/init.d/alist
index c6de70f..0fc8867 100755
--- a/luci-app-alist/root/etc/init.d/alist
+++ b/luci-app-alist/root/etc/init.d/alist
@@ -12,6 +12,7 @@ get_config() {
 	config_get data_dir $1 data_dir "/etc/alist"
 	config_get temp_dir $1 temp_dir "/tmp/alist"
 	config_get ssl $1 ssl 0
+	config_get https_port $1 https_port 5245
 	config_get ssl_cert $1 ssl_cert ""
 	config_get ssl_key $1 ssl_key ""
 	config_get token_expires_in $1 token_expires_in 48
@@ -79,7 +80,7 @@ start_service() {
 	set_firewall
 	cat /dev/null > $temp_dir/alist.log
 	cat > $data_dir/config.json <<EOF
-{"force":false,"address":"$listen_addr","port":$port,"https_port":$port,"site_url":"$site_url","cdn":"","jwt_secret":"","token_expires_in":$token_expires_in,"database":{"type":"$database","host":"$mysql_host","port":$mysql_port,"user":"$mysql_username","password":"$mysql_password","name":"$mysql_database","db_file":"$data_dir/data.db","table_prefix":"x_","ssl_mode":""},"scheme":{"disable_http":$SSL,"https":$SSL,"cert_file":"$ssl_cert","key_file":"$ssl_key"},"temp_dir":"$temp_dir","log":{"enable":$LOG,"name":"$temp_dir/alist.log","max_size":10,"max_backups":5,"max_age":28,"compress":false},"delayed_start":$delayed_start,"max_connections":$max_connections}
+{"force":false,"address":"$listen_addr","port":$port,"https_port":$https_port,"site_url":"$site_url","cdn":"","jwt_secret":"","token_expires_in":$token_expires_in,"database":{"type":"$database","host":"$mysql_host","port":$mysql_port,"user":"$mysql_username","password":"$mysql_password","name":"$mysql_database","db_file":"$data_dir/data.db","table_prefix":"x_","ssl_mode":""},"scheme":{"disable_http":false,"https":$SSL,"cert_file":"$ssl_cert","key_file":"$ssl_key"},"temp_dir":"$temp_dir","log":{"enable":$LOG,"name":"$temp_dir/alist.log","max_size":10,"max_backups":5,"max_age":28,"compress":false},"delayed_start":$delayed_start,"max_connections":$max_connections}
 EOF
 	procd_open_instance alist
 	procd_set_param command $PROG
-- 
2.34.8