From 90559c3aac490b81c0edf060104d965ac90eb967 Mon Sep 17 00:00:00 2001 From: fabaccess Date: Wed, 22 Feb 2023 20:26:14 +0100 Subject: [PATCH] fixed config --- bffh.dhall | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/bffh.dhall b/bffh.dhall index e4661f7..be9fa25 100644 --- a/bffh.dhall +++ b/bffh.dhall @@ -25,8 +25,8 @@ ], -- Configure TLS. BFFH requires a PEM-encoded certificate and the associated key as two separate files - certfile = "certs/self-signed-cert.pem", - keyfile = "certs/self-signed-key.pem", + certfile = "tfom23-demo/certs/self-signed-cert.pem", + keyfile = "tfom23-demo/certs/self-signed-key.pem", -- BFFH right now requires a running MQTT broker. mqtt_url = "mqtt://localhost:1883", @@ -43,8 +43,8 @@ -- set logging to verbose verbosity = 3, - spacename = "TFOM23-Demo", - instanceurl = "tfom23_demo.fab-access.org", + spacename = Some "TFOM23-Demo", + instanceurl = Some "tfom23_demo.fab-access.org", -- In dhall you can also easily import definitions from other files, e.g. you could write -- roles = ./roles.dhall @@ -292,17 +292,17 @@ description = Some "TFOM23 Lasercutter", disclose = "tfom23.disclose", read = "tfom23.read", - write = "tfom23.printer.use", + write = "tfom23.lasercutter.use", manage = "tfom23.manage", category = "Lasercutter" }, CNC_0 = { - name = "Other Printer ???", + name = "Some Open Hardware CNC Router", description = Some "TFOM23 CNC", disclose = "tfom23.disclose", read = "tfom23.read", - write = "tfom23.printer.use", + write = "tfom23.cnc.use", manage = "tfom23.manage", category = "CNC" }, @@ -326,91 +326,91 @@ fablock_locker_0 = { module = "Process", params = { cmd = "python", - args = "config/actors/fablock/main.py --host localhost --fablock 00000 --lock 00000" + args = "tfom23-demo/actors/fablock/main.py --host localhost --fablock 00000 --lock 00000" }}, fablock_locker_1 = { module = "Process", params = { cmd = "python", - args = "config/actors/fablock/main.py --host localhost --fablock 00000 --lock 00001" + args = "tfom23-demo/actors/fablock/main.py --host localhost --fablock 00000 --lock 00001" }}, fablock_locker_2 = { module = "Process", params = { cmd = "python", - args = "config/actors/fablock/main.py --host localhost --fablock 00000 --lock 00002" + args = "tfom23-demo/actors/fablock/main.py --host localhost --fablock 00000 --lock 00002" }}, fablock_locker_3 = { module = "Process", params = { cmd = "python", - args = "config/actors/fablock/main.py --host localhost --fablock 00000 --lock 00003" + args = "tfom23-demo/actors/fablock/main.py --host localhost --fablock 00000 --lock 00003" }}, fablock_locker_4 = { module = "Process", params = { cmd = "python", - args = "config/actors/fablock/main.py --host localhost --fablock 00000 --lock 00004" + args = "tfom23-demo/actors/fablock/main.py --host localhost --fablock 00000 --lock 00004" }}, fablock_locker_5 = { module = "Process", params = { cmd = "python", - args = "config/actors/fablock/main.py --host localhost --fablock 00000 --lock 00005" + args = "tfom23-demo/actors/fablock/main.py --host localhost --fablock 00000 --lock 00005" }}, fablock_locker_6 = { module = "Process", params = { cmd = "python", - args = "config/actors/fablock/main.py --host localhost --fablock 00000 --lock 00006" + args = "tfom23-demo/actors/fablock/main.py --host localhost --fablock 00000 --lock 00006" }}, -- LBoxx Rack fablock_lboxx_0 = { module = "Process", params = { cmd = "python", - args = "config/actors/fablock/main.py --host localhost --fablock 00001 --lock 00000" + args = "tfom23-demo/actors/fablock/main.py --host localhost --fablock 00001 --lock 00000" }}, fablock_lboxx_1 = { module = "Process", params = { cmd = "python", - args = "config/actors/fablock/main.py --host localhost --fablock 00001 --lock 00001" + args = "tfom23-demo/actors/fablock/main.py --host localhost --fablock 00001 --lock 00001" }}, fablock_lboxx_2 = { module = "Process", params = { cmd = "python", - args = "config/actors/fablock/main.py --host localhost --fablock 00001 --lock 00002" + args = "tfom23-demo/actors/fablock/main.py --host localhost --fablock 00001 --lock 00002" }}, fablock_lboxx_3 = { module = "Process", params = { cmd = "python", - args = "config/actors/fablock/main.py --host localhost --fablock 00001 --lock 00003" + args = "tfom23-demo/actors/fablock/main.py --host localhost --fablock 00001 --lock 00003" }}, fablock_lboxx_4 = { module = "Process", params = { cmd = "python", - args = "config/actors/fablock/main.py --host localhost --fablock 00001 --lock 00004" + args = "tfom23-demo/actors/fablock/main.py --host localhost --fablock 00001 --lock 00004" }}, -- FabReader fabreader_0 = { module = "Process", params = { cmd = "python", - args = "config/actors/fabreader/main.py --host localhost --fabreader 00000" + args = "tfom23-demo/actors/fabreader/main.py --host localhost --fabreader 00000" }}, fabreader_1 = { module = "Process", params = { cmd = "python", - args = "config/actors/fabreader/main.py --host localhost --fabreader 00001" + args = "tfom23-demo/actors/fabreader/main.py --host localhost --fabreader 00001" }}, fabreader_2 = { module = "Process", params = { cmd = "python", - args = "config/actors/fabreader/main.py --host localhost --fabreader 00002" + args = "tfom23-demo/actors/fabreader/main.py --host localhost --fabreader 00002" }}, fabreader_3 = { module = "Process", params = { cmd = "python", - args = "config/actors/fabreader/main.py --host localhost --fabreader 00003" + args = "tfom23-demo/actors/fabreader/main.py --host localhost --fabreader 00003" }}, fabreader_4 = { module = "Process", params = { cmd = "python", - args = "config/actors/fabreader/main.py --host localhost --fabreader 00004" + args = "tfom23-demo/actors/fabreader/main.py --host localhost --fabreader 00004" }}, },