luci-app-acme: Add Log reader

Signed-off-by: Sergey Ponomarev <redacted>

diff --git a/applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js b/applications/luci-app-acme/htdocs/luci-static/resources/view/acme/acme.js
similarity index 100%
rename from applications/luci-app-acme/htdocs/luci-static/resources/view/acme.js
rename to applications/luci-app-acme/htdocs/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
new file mode 100644 (file)
index 0000000..ff2294a
--- /dev/null
+++ 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");
\ No newline at end of file

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
index aa855905ae7807995288e25c48b73bdd0ca4e3f3..335be3c2f5c11cf8fa22a6583544ac1c78d903d4 100644 (file)
--- 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
index a8bd9f9fb30490e5c4431c9655706e8f1965cc11..5abeab06329e919a602924a4d5efc6be4c9dbc63 100644 (file)
--- 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
@@ -6,7 +6,9 @@
                         "file": {
                                 "/proc/sys/kernel/hostname": [ "read" ],
                                 "/etc/ssl/acme": [ "list" ],
-                                "/usr/libexec/acmesh-dnsinfo.sh": [ "exec" ]
+                                "/usr/libexec/acmesh-dnsinfo.sh": [ "exec" ],
+                                "/sbin/logread -e acme": [ "exec" ],
+                                "/usr/sbin/logread -e acme": [ "exec" ]
                         },
                         "uci": [ "acme" ]
                 },