luci-app-acme: Add Log reader

We must simplify for a user to understand what happened. Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
openwrt · Jun 1, 2024 · 72be42e · 72be42e
1 parent e9513c3
commit 72be42e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/...htdocs/luci-static/resources/view/acme.js → ...s/luci-static/resources/view/acme/acme.js b/...htdocs/luci-static/resources/view/acme.js → ...s/luci-static/resources/view/acme/acme.js
diff --git a/applications/luci-app-acme/htdocs/luci-static/resources/view/acme/logread.js b/applications/luci-app-acme/htdocs/luci-static/resources/view/acme/logread.js
@@ -0,0 +1,4 @@
+'use strict';
+'require tools.views as views';
+
+return views.LogreadBox("acme", "acme");
diff --git a/applications/luci-app-acme/root/usr/share/luci/menu.d/luci-app-acme.json b/applications/luci-app-acme/root/usr/share/luci/menu.d/luci-app-acme.json
@@ -3,11 +3,27 @@
 		"title": "ACME certificates",
 		"order": 50,
 		"action": {
-			"type": "view",
-			"path": "acme"
+			"type": "alias",
+			"path": "admin/services/acme/configure"
 		},
 		"depends": {
 			"acl": [ "luci-app-acme" ]
 		}
+	},
+	"admin/services/acme/configure": {
+		"title": "Configure",
+		"order": 10,
+		"action": {
+			"type": "view",
+			"path": "acme/acme"
+		}
+	},
+	"admin/services/acme/logread": {
+		"title": "Log View",
+		"order": 20,
+		"action": {
+			"type": "view",
+			"path": "acme/logread"
+		}
 	}
 }
diff --git a/applications/luci-app-acme/root/usr/share/rpcd/acl.d/luci-app-acme.json b/applications/luci-app-acme/root/usr/share/rpcd/acl.d/luci-app-acme.json
@@ -2,8 +2,11 @@
         "luci-app-acme": {
                 "description": "Grant UCI access for luci-app-acme",
                 "read": {
+                        "cgi-io": [ "exec" ],
                         "file": {
-                                "/etc/ssl/acme": [ "list" ]
+                                "/etc/ssl/acme": [ "list" ],
+                                "/sbin/logread -e acme": [ "exec" ],
+                                "/usr/sbin/logread -e acme": [ "exec" ]
                         },
                         "uci": [ "acme" ]
                 },