fst: improve config

The config struct more or less "grew" to what it is today. This change moves things around to make more sense and fixes nonsensical comments describing obsolete behaviour.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 103 insertions, 103 deletions

diff --git a/fst/template_test.go b/fst/template_test.go
index 0ec2dae2..c7fd7804 100644
--- a/fst/template_test.go
+++ b/fst/template_test.go
@@ -18,116 +18,116 @@ func TestTemplate(t *testing.T) {
 		"--enable-features=UseOzonePlatform",
 		"--ozone-platform=wayland"
 	],
-	"confinement": {
-		"app_id": 9,
-		"groups": [
-			"video"
+	"enablements": 13,
+	"session_bus": {
+		"see": null,
+		"talk": [
+			"org.freedesktop.Notifications",
+			"org.freedesktop.FileManager1",
+			"org.freedesktop.ScreenSaver",
+			"org.freedesktop.secrets",
+			"org.kde.kwalletd5",
+			"org.kde.kwalletd6",
+			"org.gnome.SessionManager"
 		],
-		"username": "chronos",
-		"home_inner": "/var/lib/fortify",
-		"home": "/var/lib/persist/home/org.chromium.Chromium",
-		"shell": "/run/current-system/sw/bin/zsh",
-		"sandbox": {
-			"hostname": "localhost",
-			"seccomp": 32,
-			"devel": true,
-			"userns": true,
-			"net": true,
-			"tty": true,
-			"multiarch": true,
-			"env": {
-				"GOOGLE_API_KEY": "AIzaSyBHDrl33hwRp4rMQY0ziRbj8K9LPA6vUCY",
-				"GOOGLE_DEFAULT_CLIENT_ID": "77185425430.apps.googleusercontent.com",
-				"GOOGLE_DEFAULT_CLIENT_SECRET": "OTJgUOQcT7lO7GsGZq2G4IlT"
-			},
-			"map_real_uid": true,
-			"device": true,
-			"filesystem": [
-				{
-					"src": "/nix/store"
-				},
-				{
-					"src": "/run/current-system"
-				},
-				{
-					"src": "/run/opengl-driver"
-				},
-				{
-					"src": "/var/db/nix-channels"
-				},
-				{
-					"dst": "/data/data/org.chromium.Chromium",
-					"src": "/var/lib/fortify/u0/org.chromium.Chromium",
-					"write": true,
-					"require": true
-				},
-				{
-					"src": "/dev/dri",
-					"dev": true
-				}
-			],
-			"symlink": [
-				[
-					"/run/user/65534",
-					"/run/user/150"
-				]
-			],
-			"etc": "/etc",
-			"auto_etc": true,
-			"cover": [
-				"/var/run/nscd"
-			]
+		"own": [
+			"org.chromium.Chromium.*",
+			"org.mpris.MediaPlayer2.org.chromium.Chromium.*",
+			"org.mpris.MediaPlayer2.chromium.*"
+		],
+		"call": {
+			"org.freedesktop.portal.*": "*"
+		},
+		"broadcast": {
+			"org.freedesktop.portal.*": "@/org/freedesktop/portal/*"
+		},
+		"filter": true
+	},
+	"system_bus": {
+		"see": null,
+		"talk": [
+			"org.bluez",
+			"org.freedesktop.Avahi",
+			"org.freedesktop.UPower"
+		],
+		"own": null,
+		"call": null,
+		"broadcast": null,
+		"filter": true
+	},
+	"username": "chronos",
+	"shell": "/run/current-system/sw/bin/zsh",
+	"data": "/var/lib/fortify/u0/org.chromium.Chromium",
+	"dir": "/data/data/org.chromium.Chromium",
+	"extra_perms": [
+		{
+			"ensure": true,
+			"path": "/var/lib/fortify/u0",
+			"x": true
 		},
-		"extra_perms": [
+		{
+			"path": "/var/lib/fortify/u0/org.chromium.Chromium",
+			"r": true,
+			"w": true,
+			"x": true
+		}
+	],
+	"identity": 9,
+	"groups": [
+		"video",
+		"dialout",
+		"plugdev"
+	],
+	"container": {
+		"hostname": "localhost",
+		"seccomp": 32,
+		"devel": true,
+		"userns": true,
+		"net": true,
+		"tty": true,
+		"multiarch": true,
+		"env": {
+			"GOOGLE_API_KEY": "AIzaSyBHDrl33hwRp4rMQY0ziRbj8K9LPA6vUCY",
+			"GOOGLE_DEFAULT_CLIENT_ID": "77185425430.apps.googleusercontent.com",
+			"GOOGLE_DEFAULT_CLIENT_SECRET": "OTJgUOQcT7lO7GsGZq2G4IlT"
+		},
+		"map_real_uid": true,
+		"device": true,
+		"filesystem": [
 			{
-				"ensure": true,
-				"path": "/var/lib/fortify/u0",
-				"x": true
+				"src": "/nix/store"
 			},
 			{
-				"path": "/var/lib/fortify/u0/org.chromium.Chromium",
-				"r": true,
-				"w": true,
-				"x": true
-			}
-		],
-		"system_bus": {
-			"see": null,
-			"talk": [
-				"org.bluez",
-				"org.freedesktop.Avahi",
-				"org.freedesktop.UPower"
-			],
-			"own": null,
-			"call": null,
-			"broadcast": null,
-			"filter": true
-		},
-		"session_bus": {
-			"see": null,
-			"talk": [
-				"org.freedesktop.Notifications",
-				"org.freedesktop.FileManager1",
-				"org.freedesktop.ScreenSaver",
-				"org.freedesktop.secrets",
-				"org.kde.kwalletd5",
-				"org.kde.kwalletd6",
-				"org.gnome.SessionManager"
-			],
-			"own": [
-				"org.chromium.Chromium.*",
-				"org.mpris.MediaPlayer2.org.chromium.Chromium.*",
-				"org.mpris.MediaPlayer2.chromium.*"
-			],
-			"call": {
-				"org.freedesktop.portal.*": "*"
+				"src": "/run/current-system"
 			},
-			"broadcast": {
-				"org.freedesktop.portal.*": "@/org/freedesktop/portal/*"
+			{
+				"src": "/run/opengl-driver"
 			},
-			"filter": true
-		},
-		"enablements": 13
+			{
+				"src": "/var/db/nix-channels"
+			},
+			{
+				"dst": "/data/data/org.chromium.Chromium",
+				"src": "/var/lib/fortify/u0/org.chromium.Chromium",
+				"write": true,
+				"require": true
+			},
+			{
+				"src": "/dev/dri",
+				"dev": true
+			}
+		],
+		"symlink": [
+			[
+				"/run/user/65534",
+				"/run/user/150"
+			]
+		],
+		"etc": "/etc",
+		"auto_etc": true,
+		"cover": [
+			"/var/run/nscd"
+		]
 	}
 }`