From 641203169459bcfbce21c7f46459f1ed29aff715 Mon Sep 17 00:00:00 2001 From: LEAN-ESX Date: Thu, 19 Dec 2019 06:04:33 -0800 Subject: [PATCH] luci-app-kodexplorer: fix curl dependency --- package/lean/luci-app-kodexplorer/Makefile | 2 +- .../luasrc/model/cbi/kodexplorer/api.lua | 4 ++-- .../luci-app-kodexplorer/root/etc/config/kodexplorer | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/lean/luci-app-kodexplorer/Makefile b/package/lean/luci-app-kodexplorer/Makefile index d71a984e0..4575dd848 100644 --- a/package/lean/luci-app-kodexplorer/Makefile +++ b/package/lean/luci-app-kodexplorer/Makefile @@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for KodExplorer LUCI_DEPENDS:=+nginx +zoneinfo-asia +php7 +php7-fpm +php7-mod-curl +php7-mod-gd +php7-mod-iconv +php7-mod-json +php7-mod-mbstring +php7-mod-opcache +php7-mod-session +php7-mod-zip LUCI_PKGARCH:=all PKG_VERSION:=1.0 -PKG_RELEASE:=9-20191217 +PKG_RELEASE:=10-20191217 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/api.lua b/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/api.lua index bcc37d26f..46abf0471 100644 --- a/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/api.lua +++ b/package/lean/luci-app-kodexplorer/luasrc/model/cbi/kodexplorer/api.lua @@ -14,7 +14,7 @@ local wget = "/usr/bin/wget" local wget_args = { "--no-check-certificate", "--quiet", "--timeout=10", "--tries=2" } -local curl = "/usr/bin/curl" + local command_timeout = 40 local function _unpack(t, i) @@ -98,7 +98,7 @@ local function get_api_json(url) -- function(chunk) output[#output + 1] = chunk end) -- local json_content = util.trim(table.concat(output)) - local json_content = luci.sys.exec(curl .. " -sL " .. url) + local json_content = luci.sys.exec("wget-ssl -q --no-check-certificate -O- " .. url) if json_content == "" then return {} end diff --git a/package/lean/luci-app-kodexplorer/root/etc/config/kodexplorer b/package/lean/luci-app-kodexplorer/root/etc/config/kodexplorer index 323bc42dc..b049415ba 100644 --- a/package/lean/luci-app-kodexplorer/root/etc/config/kodexplorer +++ b/package/lean/luci-app-kodexplorer/root/etc/config/kodexplorer @@ -1,10 +1,10 @@ config global - option port '8081' - option memory_limit '8M' - option post_max_size '12M' - option upload_max_filesize '12M' - option storage_device_path '/mnt/sda1/' - option project_directory '/mnt/sda1/kodexplorer' + option port '8080' + option storage_device_path '/opt/kodexplorer/' + option project_directory '/opt/kodexplorer' option enable '0' + option memory_limit '120M' + option post_max_size '100M' + option upload_max_filesize '100M'