From 58acf4306a8fb9ec29c69afb637d93dbcbf90cad Mon Sep 17 00:00:00 2001 From: L3D Date: Mon, 26 Feb 2024 21:01:21 +0100 Subject: [PATCH] update media and continue setup --- .../ansible_collections/community/general | 2 +- group_vars/obs/vars.yml | 16 ++++++++-------- host_vars/obs-hall2.yml | 5 +++-- roles/do1jlr.win_streamdeck | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general index 787fa46..2140485 160000 --- a/collections/ansible_collections/community/general +++ b/collections/ansible_collections/community/general @@ -1 +1 @@ -Subproject commit 787fa4621763879dae26c57aaf0028941dcaaefc +Subproject commit 21404851485e2c19f3daac4819fbbece7ada2e94 diff --git a/group_vars/obs/vars.yml b/group_vars/obs/vars.yml index 0e8d86e..9fa8f99 100644 --- a/group_vars/obs/vars.yml +++ b/group_vars/obs/vars.yml @@ -46,23 +46,23 @@ wallpaper_path: 'C:\obs\{{ win_obs_szene__project }}\background.png' win_obs_szene_files: - src: 'https://git.l3d.ch/voc/winkekatze_background/media/branch/main/png/voctocat_winkekatze_background.png' file: 'background.png' - - src: 'https://files.chvoc.ch/dgwk24/design/logo_huge.png' + - src: 'https://git.chaoswest.tv/winterkongress/dgwk24-video-backgrounds/raw/branch/master/2024/logo.png' file: 'wk24_logo.png' - - src: 'https://files.chvoc.ch/dgwk24/design/picture_in_picture.png' + - src: 'https://git.chaoswest.tv/winterkongress/dgwk24-video-backgrounds/raw/branch/master/2024/picture_in_picture.png' # - src: 'https://git.chaoswest.tv/winterkongress/wk23-obs-szene/media/branch/main/schema/background_schema_pip.png' file: 'wk24_pip.png' - - src: 'https://files.chvoc.ch/dgwk24/design/side_by_side.png' + - src: 'https://git.chaoswest.tv/winterkongress/dgwk24-video-backgrounds/raw/branch/master/2024/side_by_side.png' # - src: 'https://git.chaoswest.tv/winterkongress/wk23-obs-szene/media/branch/main/schema/background_schema_sbs.png' file: 'wk24_sbs_x2.png' - - src: 'https://files.chvoc.ch/dgwk24/design/plain.png' + - src: 'https://git.chaoswest.tv/winterkongress/dgwk24-video-backgrounds/raw/branch/master/2024/plain.png' file: 'wk24_plain.png' - - src: 'https://files.chvoc.ch/dgwk24/design/three_side_by_side.png' + - src: 'https://git.chaoswest.tv/winterkongress/dgwk24-video-backgrounds/raw/branch/master/2024/three_side_by_side.png' # - src: 'https://git.chaoswest.tv/winterkongress/wk23-obs-szene/media/branch/main/schema/background_schema_3sources.png' file: 'wk24_sbs_x3.png' - src: 'https://files.zerobyte.ch/files/hidden/dgwk22_music/luss%20dub%20techno%20session%205.mp3' file: 'wk24_background_music.mp3' - - src: https://git.chaoswest.tv/winterkongress/wk24-obs-szene/src/branch/main/obs-scene/{{ inventory_hostname }}.json - file: 'wk24-{{ inventory_hostname }}.json' + - src: "https://git.chaoswest.tv/winterkongress/wk24-obs-szene/raw/branch/main/obs-scene/{{ inventory_hostname }}.json" + file: 'wk24.json' - src: 'https://git.chaoswest.tv/winterkongress/wk24-obs-szene/raw/branch/main/obs-profile/streamEncoder.json' file: 'obs-config/streamEncoder.json' - src: 'https://git.chaoswest.tv/winterkongress/wk24-obs-szene/raw/branch/main/obs-profile/service.json' @@ -72,5 +72,5 @@ win_obs_szene_files: win_streamdeck__download_icons: true win_streamdeck__icons: - - src: 'https://git.chaoswest.tv/winterkongress/wk24-obs-szene/raw/branch/main/WK24.streamDeckProfile' + - src: 'https://git.chaoswest.tv/winterkongress/wk24-obs-szene/media/branch/main/WK24.streamDeckProfile' file: 'WK24.streamDeckProfile' diff --git a/host_vars/obs-hall2.yml b/host_vars/obs-hall2.yml index be654d1..a7add66 100644 --- a/host_vars/obs-hall2.yml +++ b/host_vars/obs-hall2.yml @@ -1,4 +1,5 @@ --- -task__sound_muted: true -task__sound_obs: true +task__sound_muted: false +task__sound_obs: false +task__obs_firewall: false # ansible_user: 'voc' diff --git a/roles/do1jlr.win_streamdeck b/roles/do1jlr.win_streamdeck index fabf20a..b20daf6 160000 --- a/roles/do1jlr.win_streamdeck +++ b/roles/do1jlr.win_streamdeck @@ -1 +1 @@ -Subproject commit fabf20ab0e9630888b791c01e6f21f3f29a3e04b +Subproject commit b20daf641eedc179f4181a7526b77d790790e380