Merge branch 'main' of gitlab.com:fabinfra/fabaccess/tfom23-demo

actors/fabpel

@@ -1 +1 @@
-Subproject commit 35fc4270e1a03e0fd47787866535f2c2a0d5b1e6
+Subproject commit 2ba4d09e5ef219d3480d333c1da774fa5ed278ef

bffh.dhall

@@ -66,8 +66,6 @@
             [
                 "tfom23.disclose",
                 "tfom23.read",
-
-
             ]
         },
         Admin = 
@@ -124,6 +122,13 @@
                 "tfom23.printer.write",
             ]
         },
+        Prusa = 
+        {
+            permissions = 
+            [ 
+                "tfom23.prusa.write",
+            ]
+        },
         CNC = 
         {
             permissions = 
@@ -267,7 +272,7 @@
         },
         Door_0 = 
         { 
-            name = "Door ???",
+            name = "3D-Printer Accesories",
             description = Some "Kallax Door",
             disclose = "tfom23.disclose",
             read = "tfom23.read",
@@ -284,7 +289,7 @@
             description = Some "FabAccess Prusa MK3",
             disclose = "tfom23.disclose",
             read = "tfom23.read",
-            write = "tfom23.printer.write",
+            write = "tfom23.prusa.write",
             manage = "tfom23.manage",
             category = "Printers"
         },

users.toml

@@ -7,7 +7,19 @@ roles = ["Default", "Manage"]
 passwd = "secret"
 
 [Maker]
-roles = ["Default"]
+roles = ["Default", "EuroBox", "LBoxx", "Locker", "Prusa"]
+passwd = "secret"
+
+[Maker-Lasercutter]
+roles = ["Default", "Lasercutter"]
+passwd = "secret"
+
+[Maker-CNC]
+roles = ["Default", "CNC"]
+passwd = "secret"
+
+[Maker-Printer]
+roles = ["Default", "Printer"]
 passwd = "secret"
 
 [Bot]