From: Florian Eckert <fe@dev.tdt.de>
Date: Fri, 6 Aug 2021 08:03:58 +0000 (+0200)
Subject: luci-mod-status: move index acl into own file
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1d26eb4200fd30230c919baf053a9c12e79312f2;p=project%2Fluci.git

luci-mod-status: move index acl into own file

The ACL file luci-mod-status.json is already quite long.
It is also a separate menu item in LuCI, so in my view it makes sense to
move it to a separate file. An additional positive effect is that the
file then becomes clearer.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---

diff --git a/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status-index.json b/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status-index.json
new file mode 100644
index 0000000000..a9ae0cef49
--- /dev/null
+++ b/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status-index.json
@@ -0,0 +1,52 @@
+{
+	"luci-mod-status-index": {
+		"description": "Grant access to main status display",
+		"read": {
+			"file": {
+				"/proc/sys/net/netfilter/nf_conntrack_count": [ "read" ],
+				"/proc/sys/net/netfilter/nf_conntrack_max": [ "read" ],
+				"/usr/lib/lua/luci/version.lua": [ "read" ],
+				"/www/luci-static/resources/view/status/include": [ "list" ]
+			},
+			"ubus": {
+				"file": [ "list", "read" ],
+				"system": [ "board", "info" ]
+			}
+		},
+		"write": {
+			"uci": [ "dhcp" ]
+		}
+	},
+
+	"luci-mod-status-index-dhcp": {
+		"description": "Grant access to DHCP status display",
+		"read": {
+			"ubus": {
+				"luci-rpc": [ "getDHCPLeases" ]
+			}
+		}
+	},
+
+	"luci-mod-status-index-dsl": {
+		"description": "Grant access to DSL status display",
+		"read": {
+			"ubus": {
+				"dsl": [ "metrics" ]
+			}
+		}
+	},
+
+	"luci-mod-status-index-wifi": {
+		"description": "Grant access to wireless status display",
+		"read": {
+			"ubus": {
+				"iwinfo": [ "assoclist" ]
+			}
+		},
+		"write": {
+			"ubus": {
+				"hostapd.*": [ "del_client", "wps_start", "wps_cancel", "wps_status" ]
+			}
+		}
+	}
+}
diff --git a/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json b/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json
index 7199cb76f9..32de24c06f 100644
--- a/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json
+++ b/modules/luci-mod-status/root/usr/share/rpcd/acl.d/luci-mod-status.json
@@ -90,56 +90,5 @@
 				"file": [ "exec" ]
 			}
 		}
-	},
-
-	"luci-mod-status-index": {
-		"description": "Grant access to main status display",
-		"read": {
-			"file": {
-				"/proc/sys/net/netfilter/nf_conntrack_count": [ "read" ],
-				"/proc/sys/net/netfilter/nf_conntrack_max": [ "read" ],
-				"/usr/lib/lua/luci/version.lua": [ "read" ],
-				"/www/luci-static/resources/view/status/include": [ "list" ]
-			},
-			"ubus": {
-				"file": [ "list", "read" ],
-				"system": [ "board", "info" ]
-			}
-		},
-		"write": {
-			"uci": [ "dhcp" ]
-		}
-	},
-
-	"luci-mod-status-index-dhcp": {
-		"description": "Grant access to DHCP status display",
-		"read": {
-			"ubus": {
-				"luci-rpc": [ "getDHCPLeases" ]
-			}
-		}
-	},
-
-	"luci-mod-status-index-dsl": {
-		"description": "Grant access to DSL status display",
-		"read": {
-			"ubus": {
-				"dsl": [ "metrics" ]
-			}
-		}
-	},
-
-	"luci-mod-status-index-wifi": {
-		"description": "Grant access to wireless status display",
-		"read": {
-			"ubus": {
-				"iwinfo": [ "assoclist" ]
-			}
-		},
-		"write": {
-			"ubus": {
-				"hostapd.*": [ "del_client", "wps_start", "wps_cancel", "wps_status" ]
-			}
-		}
 	}
 }