diff --git a/bundlewrap/data/voctocore-artwork/files/mrmcd24/bg.png b/bundlewrap/data/voctocore-artwork/files/mrmcd24/bg.png new file mode 100644 index 000000000..3c9d5a297 Binary files /dev/null and b/bundlewrap/data/voctocore-artwork/files/mrmcd24/bg.png differ diff --git a/bundlewrap/data/voctocore-artwork/files/mrmcd24/bg_sbs.png b/bundlewrap/data/voctocore-artwork/files/mrmcd24/bg_sbs.png new file mode 100644 index 000000000..ddba038ce Binary files /dev/null and b/bundlewrap/data/voctocore-artwork/files/mrmcd24/bg_sbs.png differ diff --git a/bundlewrap/groups/mrmcd24.toml b/bundlewrap/groups/mrmcd24.toml new file mode 100644 index 000000000..fd16d2a4e --- /dev/null +++ b/bundlewrap/groups/mrmcd24.toml @@ -0,0 +1,6 @@ +subgroups = ["saal3", "saal4", "servercase"] +members = ["releasing"] + +[metadata.event] +name = "MRMCD 2024" +slug = "mrmcd24" diff --git a/bundlewrap/nodes/encoder3.toml b/bundlewrap/nodes/encoder3.toml index 71ec4659b..8496fb157 100644 --- a/bundlewrap/nodes/encoder3.toml +++ b/bundlewrap/nodes/encoder3.toml @@ -11,7 +11,7 @@ meta.secret = "!kee_pass:ansible|worker-groups|encoder3-meta" meta.token = "!kee_user:ansible|worker-groups|encoder3-meta" [metadata.event] -room_name = "Saal 3" +room_name = "C205 - Ocean Starr" [metadata.interfaces.eth0] ips = ["10.73.3.3/16"] @@ -24,6 +24,10 @@ streaming_auth_key = "!decrypt:encrypt$gAAAAABkNYjN4gPPKKkywsLJdC9zZItzoy55F_RlJ devicenumber = 1 mode = "1080i50" +[metadata.voctocore.sources.cam2] +devicenumber = 3 +mode = "1080i50" + [metadata.voctocore.sources.slides] devicenumber = 5 mode = "1080p25" diff --git a/bundlewrap/nodes/encoder4.toml b/bundlewrap/nodes/encoder4.toml index 035b04a7a..482bff531 100644 --- a/bundlewrap/nodes/encoder4.toml +++ b/bundlewrap/nodes/encoder4.toml @@ -11,7 +11,7 @@ meta.secret = "!kee_pass:ansible|worker-groups|encoder4-meta" meta.token = "!kee_user:ansible|worker-groups|encoder4-meta" [metadata.event] -room_name = "Saal 4" +room_name = "C120 - Rainbow Warrior" [metadata.interfaces.eth0] ips = ["10.73.4.3/16"] diff --git a/bundlewrap/nodes/mixer3.toml b/bundlewrap/nodes/mixer3.toml index 84d2eff29..3d33a447d 100644 --- a/bundlewrap/nodes/mixer3.toml +++ b/bundlewrap/nodes/mixer3.toml @@ -7,3 +7,9 @@ groups = ["debian-bookworm"] [metadata.interfaces.eth0] ips = ["10.73.3.1/16"] gateway4 = "10.73.0.254" + +[metadata.pygtk-atem-switcher.atem.settings.inputs] +input1 = "Laptop" +input2 = "x" +input3 = "x" +input4 = "info-beamer" diff --git a/bundlewrap/nodes/mixer4.toml b/bundlewrap/nodes/mixer4.toml index f32793411..ebdc4725a 100644 --- a/bundlewrap/nodes/mixer4.toml +++ b/bundlewrap/nodes/mixer4.toml @@ -7,3 +7,9 @@ groups = ["debian-bookworm"] [metadata.interfaces.eth0] ips = ["10.73.4.1/16"] gateway4 = "10.73.0.254" + +[metadata.pygtk-atem-switcher.atem.settings.inputs] +input1 = "Laptop" +input2 = "x" +input3 = "x" +input4 = "info-beamer"