Merge Mainline

This commit is contained in:
CN_SZTL 2020-05-10 12:00:19 +08:00
commit 4ede6d50d1
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
5 changed files with 5 additions and 13 deletions

View File

@ -6,7 +6,7 @@ function index()
end
local page
page = entry({"admin", "services", "openclash"}, alias("admin", "services", "openclash", "client"), _("OpenClash"), 50)
page.dependent = true
page.acl_depends = { "luci-app-openclash" }

View File

@ -43,4 +43,4 @@ cfg_server_address()
rm -rf "$SER_FAKE_FILTER_FILE" 2>/dev/null
config_load "openclash"
config_foreach cfg_server_address "servers"
config_foreach cfg_server_address "servers"

View File

@ -1,11 +0,0 @@
{
"luci-app-openclash": {
"description": "Grant UCI access for luci-app-openclash",
"read": {
"uci": [ "openclash" ]
},
"write": {
"uci": [ "openclash" ]
}
}
}

View File

@ -32,6 +32,9 @@ init_config() {
[ -f "$config_path" ] || touch "$config_path"
[ -d "/lib/upgrade/keep.d" ] || mkdir -p /lib/upgrade/keep.d/luci-app-rclone 2>/dev/null
echo "$config_path" > /lib/upgrade/keep.d/luci-app-rclone
log_dir=${log_path%/*}
[ -d "$log_dir" ] || mkdir -p "$log_dir" 2>/dev/null && echo /dev/null > "$log_path"