Merge pull request #4447 from dibdot/trm-2.0

luci-app-travelmate: release 2.0

2 files changed, 63 insertions, 4 deletions

diff --git a/applications/luci-app-travelmate/root/usr/share/luci/menu.d/luci-app-travelmate.json b/applications/luci-app-travelmate/root/usr/share/luci/menu.d/luci-app-travelmate.json
new file mode 100644
index 0000000000..79a0299425
--- /dev/null
+++ b/applications/luci-app-travelmate/root/usr/share/luci/menu.d/luci-app-travelmate.json
@@ -0,0 +1,42 @@
+{
+	"admin/services/travelmate": {
+		"title": "Travelmate",
+		"order": "60",
+		"action": {
+			"type": "alias",
+			"path": "admin/services/travelmate/overview"
+		},
+		"depends": {
+			"acl": [ "luci-app-travelmate" ],
+			"fs": {
+				"/usr/bin/travelmate.sh": "executable",
+				"/etc/init.d/travelmate": "executable"
+			},
+			"uci": { "travelmate": true }
+		}
+	},
+	"admin/services/travelmate/overview": {
+		"title": "Overview",
+		"order": 10,
+		"action": {
+			"type": "view",
+			"path": "travelmate/overview"
+		}
+	},
+	"admin/services/travelmate/stations": {
+		"title": "Wireless Stations",
+		"order": 20,
+		"action": {
+			"type": "view",
+			"path": "travelmate/stations"
+		}
+	},
+	"admin/services/travelmate/logread": {
+		"title": "Log View",
+		"order": 30,
+		"action": {
+			"type": "view",
+			"path": "travelmate/logread"
+		}
+	}
+}
diff --git a/applications/luci-app-travelmate/root/usr/share/rpcd/acl.d/luci-app-travelmate.json b/applications/luci-app-travelmate/root/usr/share/rpcd/acl.d/luci-app-travelmate.json
index a66bc8add6..f3861e0fb6 100644
--- a/applications/luci-app-travelmate/root/usr/share/rpcd/acl.d/luci-app-travelmate.json
+++ b/applications/luci-app-travelmate/root/usr/share/rpcd/acl.d/luci-app-travelmate.json
@@ -1,11 +1,28 @@
 {
 	"luci-app-travelmate": {
-		"description": "Grant UCI access for luci-app-travelmate",
-		"read": {
-			"uci": [ "travelmate" ]
-		},
+		"description": "Grant access to LuCI app travelmate",
 		"write": {
+			"file": {
+				"/var/run/travelmate.refresh": [ "write" ]
+			},
 			"uci": [ "travelmate" ]
+		},
+		"read": {
+			"cgi-io": [ "exec" ],
+			"file": {
+				"/etc/travelmate/*.login": [ "list" ],
+				"/var/run/travelmate.pid": [ "read" ],
+				"/var/run/travelmate.refresh": [ "read" ],
+				"/tmp/trm_runtime.json": [ "read" ],
+				"/sbin/logread -e trm-": [ "exec" ],
+				"/usr/sbin/logread -e trm-": [ "exec" ],
+				"/etc/init.d/travelmate reload" : [ "exec" ],
+				"/etc/init.d/travelmate restart" : [ "exec" ],
+				"/etc/init.d/travelmate setup [0-9a-z_]* [0-9a-z_]* [0-9]*" : [ "exec" ],
+				"/etc/init.d/travelmate scan radio[0-9]" : [ "exec" ],
+				"/usr/bin/qrencode --inline --8bit --type=SVG --output=- *" : [ "exec" ]
+			},
+			"uci": [ "travelmate", "wireless" ]
 		}
 	}
 }