move all streaming machines to desktopvideo 12.5 and prepare for bookworm

11 files changed, 26 insertions, 51 deletions

diff --git a/inventory/host_vars/ch-calypso.yml b/inventory/host_vars/ch-calypso.yml
index c778d76f..05a408d5 100644
--- a/inventory/host_vars/ch-calypso.yml
+++ b/inventory/host_vars/ch-calypso.yml
@@ -16,16 +16,11 @@ network:
   - *_network_primary_
 
 
-apt_repo_components:
-  - main
-  - contrib
-  - non-free ## for microcode updates
-
 spreadspace_apt_repo_components:
   - container
 
 
-blackmagic_desktopvideo_version: 12.2.2a6
+blackmagic_desktopvideo_version: 12.5a15
 blackmagic_desktopvideo_include_gui: yes
 
 
diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml
index 1a9ba770..414eb528 100644
--- a/inventory/host_vars/ch-dione.yml
+++ b/inventory/host_vars/ch-dione.yml
@@ -19,16 +19,11 @@ network:
   - *_network_primary_
 
 
-apt_repo_components:
-  - main
-  - contrib
-  - non-free ## for microcode updates
-
 spreadspace_apt_repo_components:
   - container
 
 
-blackmagic_desktopvideo_version: 12.2.2a6
+blackmagic_desktopvideo_version: 12.5a15
 blackmagic_desktopvideo_include_gui: yes
 
 
@@ -62,7 +57,7 @@ kubelet_storage:
 
 # streamer_rtmp_base_path: /srv/storage/streamer
 # streamer_rtmp_inst_name: feed
-# streamer_rtmp_nginx_image_version: 2022-07-10.30
-# streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-07-08.29
+# streamer_rtmp_nginx_image_version: 2024-02-18.31
+# streamer_rtmp_ffmpeg_image_version: bookworm-decklink12.5-2024-02-08.32
 # streamer_rtmp_input: ['-f', 'decklink', '-format_code', 'Hp60', '-video_input', 'sdi', '-ac', '2', '-i', 'DeckLink Studio 4K']
 # streamer_rtmp_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv:format=yuv420p"
diff --git a/inventory/host_vars/ch-helene.yml b/inventory/host_vars/ch-helene.yml
index 7bd5104e..d7a0c306 100644
--- a/inventory/host_vars/ch-helene.yml
+++ b/inventory/host_vars/ch-helene.yml
@@ -19,16 +19,11 @@ network:
   - *_network_primary_
 
 
-apt_repo_components:
-  - main
-  - contrib
-  - non-free ## for microcode updates
-
 spreadspace_apt_repo_components:
   - container
 
 
-blackmagic_desktopvideo_version: 12.2.2a6
+blackmagic_desktopvideo_version: 12.5a15
 blackmagic_desktopvideo_include_gui: yes
 
 
@@ -62,7 +57,7 @@ kubelet_storage:
 
 # streamer_rtmp_base_path: /srv/storage/streamer
 # streamer_rtmp_inst_name: feed
-# streamer_rtmp_nginx_image_version: 2022-06-12.26
-# streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-06-12.26
+# streamer_rtmp_nginx_image_version: 2024-02-18.31
+# streamer_rtmp_ffmpeg_image_version: bookworm-decklink12.5-2024-02-08.32
 # streamer_rtmp_input: ['-f', 'decklink', '-format_code', 'Hp50', '-ac', '2', '-i', 'DeckLink SDI 4K']
 # streamer_rtmp_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv:format=yuv420p"
diff --git a/inventory/host_vars/ch-hyperion.yml b/inventory/host_vars/ch-hyperion.yml
index e37a897d..7a0d7d26 100644
--- a/inventory/host_vars/ch-hyperion.yml
+++ b/inventory/host_vars/ch-hyperion.yml
@@ -66,10 +66,10 @@ ws_base_extra_packages:
 #   autologin-user-timeout: 0
 
 
-blackmagic_desktopvideo_version: 12.2.2a6
+blackmagic_desktopvideo_version: 12.5a15
 blackmagic_desktopvideo_include_gui: yes
 
-blackmagic_mediaexpress_version: 3.7a7
+blackmagic_mediaexpress_version: 3.8.1a4
 
 
 docker_pkg_provider: docker-com
diff --git a/inventory/host_vars/ch-telesto.yml b/inventory/host_vars/ch-telesto.yml
index 343710ef..b6e0f3bf 100644
--- a/inventory/host_vars/ch-telesto.yml
+++ b/inventory/host_vars/ch-telesto.yml
@@ -74,7 +74,7 @@ ws_base_lightdm_defaults:
   autologin-user-timeout: 0
 
 
-blackmagic_desktopvideo_version: 11.7a12
+blackmagic_desktopvideo_version: 12.5a15
 blackmagic_desktopvideo_include_gui: yes
 
-blackmagic_mediaexpress_version: 3.6.2a2
+blackmagic_mediaexpress_version: 3.8.1a4
diff --git a/inventory/host_vars/ch-thetys.yml b/inventory/host_vars/ch-thetys.yml
index 23c38ec7..a4fa9b69 100644
--- a/inventory/host_vars/ch-thetys.yml
+++ b/inventory/host_vars/ch-thetys.yml
@@ -18,16 +18,11 @@ network:
   - *_network_primary_
 
 
-apt_repo_components:
-  - main
-  - contrib
-  - non-free ## for microcode updates
-
 spreadspace_apt_repo_components:
   - container
 
 
-blackmagic_desktopvideo_version: 12.2.2a6
+blackmagic_desktopvideo_version: 12.5a15
 blackmagic_desktopvideo_include_gui: yes
 
 
diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml
index 34529e0f..49eb57ac 100644
--- a/inventory/host_vars/ele-thetys.yml
+++ b/inventory/host_vars/ele-thetys.yml
@@ -90,7 +90,7 @@ streamer_rtmp_storage:
   fs: ext4
 streamer_rtmp_base_path: /srv/streamer
 streamer_rtmp_inst_name: emc-feed
-streamer_rtmp_nginx_image_version: 2022-07-10.30
+streamer_rtmp_nginx_image_version: 2024-02-18.31
 streamer_rtmp_ffmpeg_image_version: bookworm-decklink12.5-2024-02-08.32
 streamer_rtmp_input: ['-f', 'decklink', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink SDI 4K']
 streamer_rtmp_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv:format=yuv420p"
diff --git a/inventory/host_vars/ele-tsdatacop.yml b/inventory/host_vars/ele-tsdatacop.yml
index 6df46a93..632c0941 100644
--- a/inventory/host_vars/ele-tsdatacop.yml
+++ b/inventory/host_vars/ele-tsdatacop.yml
@@ -73,7 +73,7 @@ ws_base_lightdm_defaults:
   autologin-user-timeout: 0
 
 
-blackmagic_desktopvideo_version: 12.2.2a6
+blackmagic_desktopvideo_version: 12.5a15
 blackmagic_desktopvideo_include_gui: yes
 
-blackmagic_mediaexpress_version: 3.7a7
+blackmagic_mediaexpress_version: 3.8.1a4
diff --git a/inventory/host_vars/glt-calypso.yml b/inventory/host_vars/glt-calypso.yml
index 61da1f8c..cbe70140 100644
--- a/inventory/host_vars/glt-calypso.yml
+++ b/inventory/host_vars/glt-calypso.yml
@@ -22,8 +22,8 @@ network:
 
 apt_repo_components:
   - main
-  - contrib
-  - non-free ## for microcode updates
+  - contrib ## for zfs
+  - non-free-firmware ## for microcode updates
 
 spreadspace_apt_repo_components:
   - container
@@ -38,7 +38,7 @@ zfs_pools:
     create_vdevs: mirror /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720805 /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720811
 
 
-blackmagic_desktopvideo_version: 12.2.2a6
+blackmagic_desktopvideo_version: 12.5a15
 blackmagic_desktopvideo_include_gui: yes
 
 
@@ -69,7 +69,7 @@ recorder_storage:
   name: recorder
 recorder_base_path: /srv/storage/recorder
 recorder_inst_name: feed-glt21s1
-recorder_ffmpeg_image_version: bullseye-decklink11.7-2022-06-12.26
+recorder_ffmpeg_image_version: bookworm-decklink12.5-2024-02-08.32
 recorder_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink SDI (1)']
 recorder_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv"
 
diff --git a/inventory/host_vars/glt-tsdatacop.yml b/inventory/host_vars/glt-tsdatacop.yml
index 7c7bcf1a..e4b6370a 100644
--- a/inventory/host_vars/glt-tsdatacop.yml
+++ b/inventory/host_vars/glt-tsdatacop.yml
@@ -19,11 +19,6 @@ network:
   - *_network_primary_
 
 
-apt_repo_components:
-  - main
-  - contrib
-  - non-free ## for microcode updates
-
 spreadspace_apt_repo_components:
   - container
 
@@ -34,7 +29,7 @@ lvm_groups:
     - /dev/disk/by-id/ata-WDC_WD5000AAJS-00TKA0_WD-WCAPW2771922-part1
 
 
-blackmagic_desktopvideo_version: 12.2.2a6
+blackmagic_desktopvideo_version: 12.5a15
 blackmagic_desktopvideo_include_gui: yes
 
 
@@ -67,7 +62,7 @@ recorder_storage:
   fs: ext4
 recorder_base_path: /srv/recorder
 recorder_inst_name: feed-glt21s3
-recorder_ffmpeg_image_version: bullseye-decklink11.7-2022-06-12.26
+recorder_ffmpeg_image_version: bookworm-decklink12.5-2024-02-08.32
 recorder_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink Mini Recorder']
 recorder_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv"
 
diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml
index 0a899916..4298d174 100644
--- a/inventory/host_vars/s2-thetys.yml
+++ b/inventory/host_vars/s2-thetys.yml
@@ -27,14 +27,14 @@ admin_users_host:
 
 apt_repo_components:
   - main
-  - contrib
-  - non-free ## for microcode updates
+  - contrib ## for zfs
+  - non-free-firmware ## for microcode updates
 
 spreadspace_apt_repo_components:
   - container
 
 
-blackmagic_desktopvideo_version: 12.2.2a6
+blackmagic_desktopvideo_version: 12.5a15
 blackmagic_desktopvideo_include_gui: yes
 
 
@@ -70,8 +70,8 @@ zfs_pools:
 
 streamer_rtmp_base_path: /srv/storage/streamer
 streamer_rtmp_inst_name: feed
-streamer_rtmp_nginx_image_version: 2022-06-12.26
-streamer_rtmp_ffmpeg_image_version: bullseye-decklink11.7-2022-06-12.26
+streamer_rtmp_nginx_image_version: 2024-02-18.31
+streamer_rtmp_ffmpeg_image_version: bookworm-decklink12.5-2024-02-08.32
 streamer_rtmp_input: ['-f', 'decklink', '-video_input', 'sdi', '-format_code', 'Hp25', '-ac', '2', '-i', 'DeckLink Mini Recorder']
 streamer_rtmp_video_filter_common: "colorspace=iall=bt709:irange=tv:all=bt709:range=tv:format=yuv420p"
 streamer_rtmp_recording: