From 625abbfdbe94dada023ebd8ea69778173d1a7351 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 5 Feb 2020 16:51:19 +0100
Subject: treewide: convert simple Lua controllers to declarative JSON

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
 .../luasrc/controller/yggdrasil.lua                | 16 ------
 .../usr/share/luci/menu.d/luci-app-yggdrasil.json  | 65 ++++++++++++++++++++++
 2 files changed, 65 insertions(+), 16 deletions(-)
 delete mode 100644 applications/luci-app-yggdrasil/luasrc/controller/yggdrasil.lua
 create mode 100644 applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json

(limited to 'applications/luci-app-yggdrasil')

diff --git a/applications/luci-app-yggdrasil/luasrc/controller/yggdrasil.lua b/applications/luci-app-yggdrasil/luasrc/controller/yggdrasil.lua
deleted file mode 100644
index 8a955520f8..0000000000
--- a/applications/luci-app-yggdrasil/luasrc/controller/yggdrasil.lua
+++ /dev/null
@@ -1,16 +0,0 @@
-module("luci.controller.yggdrasil", package.seeall)
-
-function index()
-	if not nixio.fs.access("/etc/config/yggdrasil") then
-		return
-	end
-
-	entry({"admin", "network", "yggdrasil"}, firstchild(), "Yggdrasil").dependent = true
-	entry({"admin", "network", "yggdrasil", "status"}, view("yggdrasil/status"), _("Status"), 1).leaf = false
-
-	entry({"admin", "network", "yggdrasil", "peers"}, view("yggdrasil/peers"), _("Peers"), 2).leaf = false
-	entry({"admin", "network", "yggdrasil", "settings"}, view("yggdrasil/settings"), _("Settings"), 3).leaf = false
-	entry({"admin", "network", "yggdrasil", "keys"}, view("yggdrasil/keys"), _("Encryption keys"), 4).leaf = false
-	entry({"admin", "network", "yggdrasil", "session_firewall"}, view("yggdrasil/session_firewall"), _("Session firewall"), 5).leaf = false
-	entry({"admin", "network", "yggdrasil", "tunnel_routing"}, view("yggdrasil/tunnel_routing"), _("Tunnel routing"), 6).leaf = false
-end
diff --git a/applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json b/applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json
new file mode 100644
index 0000000000..dbe9331b2f
--- /dev/null
+++ b/applications/luci-app-yggdrasil/root/usr/share/luci/menu.d/luci-app-yggdrasil.json
@@ -0,0 +1,65 @@
+{
+	"admin/network/yggdrasil": {
+		"title": "Yggdrasil",
+		"action": {
+			"type": "firstchild"
+		},
+		"depends": {
+			"uci": { "yggdrasil": true }
+		}
+	},
+
+	"admin/network/yggdrasil/status": {
+		"title": "Status",
+		"order": 1,
+		"action": {
+			"type": "view",
+			"path": "yggdrasil/status"
+		}
+	},
+
+	"admin/network/yggdrasil/peers": {
+		"title": "Peers",
+		"order": 2,
+		"action": {
+			"type": "view",
+			"path": "yggdrasil/peers"
+		}
+	},
+
+	"admin/network/yggdrasil/settings": {
+		"title": "Settings",
+		"order": 3,
+		"action": {
+			"type": "view",
+			"path": "yggdrasil/settings"
+		}
+	},
+
+	"admin/network/yggdrasil/keys": {
+		"title": "Encryption keys",
+		"order": 4,
+		"action": {
+			"type": "view",
+			"path": "yggdrasil/keys"
+		}
+	},
+
+	"admin/network/yggdrasil/session_firewall": {
+		"title": "Session firewall",
+		"order": 5,
+		"action": {
+			"type": "view",
+			"path": "yggdrasil/session_firewall"
+		}
+	},
+
+	"admin/network/yggdrasil/tunnel_routing": {
+		"title": "Tunnel routing",
+		"order": 6,
+		"action": {
+			"type": "view",
+			"path": "yggdrasil/tunnel_routing"
+		}
+	}
+}
-- 
cgit v1.2.3