From 5865d02bfd9dad34e2d3106d57675045d8eb235c Mon Sep 17 00:00:00 2001 From: Ayushman Tripathi Date: Wed, 21 Jun 2023 19:14:19 +0530 Subject: luci-app-uhttpd: some fixes because of the lua to javascript porting * Fix menu path for uhttpd * Add hint that files could only be uploaded to /etc/luci-uploads * Rename not knowing enable_delete FileUpload option to enable_remove * Update ACL list Signed-off-by: Ayushman Tripathi Improvement of the commit title and description Signed-off-by: Florian Eckert --- .../root/usr/share/luci/menu.d/luci-app-uhttpd.json | 2 +- .../root/usr/share/rpcd/acl.d/luci-app-uhttpd.json | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'applications/luci-app-uhttpd/root') diff --git a/applications/luci-app-uhttpd/root/usr/share/luci/menu.d/luci-app-uhttpd.json b/applications/luci-app-uhttpd/root/usr/share/luci/menu.d/luci-app-uhttpd.json index 03a97cb2e7..e372a37d0f 100644 --- a/applications/luci-app-uhttpd/root/usr/share/luci/menu.d/luci-app-uhttpd.json +++ b/applications/luci-app-uhttpd/root/usr/share/luci/menu.d/luci-app-uhttpd.json @@ -3,7 +3,7 @@ "title": "uHTTPd", "action": { "type": "view", - "path": "uhttpd" + "path": "uhttpd/uhttpd" }, "depends": { "acl": [ "luci-app-uhttpd" ], diff --git a/applications/luci-app-uhttpd/root/usr/share/rpcd/acl.d/luci-app-uhttpd.json b/applications/luci-app-uhttpd/root/usr/share/rpcd/acl.d/luci-app-uhttpd.json index ab946db77a..f03d0d1a45 100644 --- a/applications/luci-app-uhttpd/root/usr/share/rpcd/acl.d/luci-app-uhttpd.json +++ b/applications/luci-app-uhttpd/root/usr/share/rpcd/acl.d/luci-app-uhttpd.json @@ -2,16 +2,18 @@ "luci-app-uhttpd": { "description": "Grant UCI access for luci-app-uhttpd", "read": { - "uci": [ "uhttpd" ], + "uci": ["uhttpd"], "file": { - "/*": ["read"] + "/*": ["read"], + "/etc/init.d/uhttpd restart": ["exec"] } }, "write": { - "uci": [ "uhttpd" ], + "uci": ["uhttpd"], "file": { - "/*": ["write"], - "/etc/init.d/uhttpd restart": ["exec"] + "/etc/luci-uploads/*": ["write"], + "/etc/uhttpd.key": ["write"], + "/etc/uhttpd.crt": ["write"] } } } -- cgit v1.2.3