Merge Mainline
This commit is contained in:
commit
4ede6d50d1
@ -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" }
|
||||
|
||||
0
package/ctcgfw/luci-app-openclash/files/usr/share/openclash/cfg_servers_address_fake_filter.sh
Normal file → Executable file
0
package/ctcgfw/luci-app-openclash/files/usr/share/openclash/cfg_servers_address_fake_filter.sh
Normal file → Executable file
2
package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh
Normal file → Executable file
2
package/ctcgfw/luci-app-openclash/files/usr/share/openclash/openclash_fake_filter.sh
Normal file → Executable 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"
|
||||
@ -1,11 +0,0 @@
|
||||
{
|
||||
"luci-app-openclash": {
|
||||
"description": "Grant UCI access for luci-app-openclash",
|
||||
"read": {
|
||||
"uci": [ "openclash" ]
|
||||
},
|
||||
"write": {
|
||||
"uci": [ "openclash" ]
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -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"
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user