From 2d2a16eb062692efe5fca7f5e0435836e757a099 Mon Sep 17 00:00:00 2001 From: L3D Date: Mon, 26 Feb 2024 01:20:03 +0100 Subject: [PATCH] update os config --- group_vars/obs/vars.yml | 32 ++++++++++++++++---------------- roles/do1jlr.win_streamdeck | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/group_vars/obs/vars.yml b/group_vars/obs/vars.yml index e5f1af6..0e8d86e 100644 --- a/group_vars/obs/vars.yml +++ b/group_vars/obs/vars.yml @@ -48,29 +48,29 @@ win_obs_szene_files: file: 'background.png' - src: 'https://files.chvoc.ch/dgwk24/design/logo_huge.png' file: 'wk24_logo.png' -# - src: 'https://files.chvoc.ch/dgwk24/design/picture_in_picture.png' - - src: 'https://git.chaoswest.tv/winterkongress/wk23-obs-szene/media/branch/main/schema/background_schema_pip.png' + - src: 'https://files.chvoc.ch/dgwk24/design/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/wk23-obs-szene/media/branch/main/schema/background_schema_sbs.png' + - src: 'https://files.chvoc.ch/dgwk24/design/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' file: 'wk24_plain.png' -# - src: 'https://files.chvoc.ch/dgwk24/design/three_side_by_side.png' - - src: 'https://git.chaoswest.tv/winterkongress/wk23-obs-szene/media/branch/main/schema/background_schema_3sources.png' + - src: 'https://files.chvoc.ch/dgwk24/design/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.l3d.ch/voc/wk23-obs-szene/media/branch/main/wk23-{{ inventory_hostname }}.json' -# file: 'wk23-{{ inventory_hostname }}.json' -# - src: 'https://git.l3d.ch/voc/wk23-obs-szene/media/branch/main/profile/streamEncoder.json' -# file: 'obs-config/streamEncoder.json' -# - src: 'https://git.l3d.ch/voc/wk23-obs-szene/media/branch/main/profile/service.json' -# file: 'obs-config/service.json' -# - src: 'https://git.l3d.ch/voc/wk23-obs-szene/media/branch/main/profile/basic.ini' -# file: 'obs-config/basic.ini' + - 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-profile/streamEncoder.json' + file: 'obs-config/streamEncoder.json' + - src: 'https://git.chaoswest.tv/winterkongress/wk24-obs-szene/raw/branch/main/obs-profile/service.json' + file: 'obs-config/service.json' + - src: 'https://git.chaoswest.tv/winterkongress/wk24-obs-szene/raw/branch/main/obs-profile/basic.ini' + file: 'obs-config/basic.ini' win_streamdeck__download_icons: true win_streamdeck__icons: - - src: 'https://git.l3d.ch/voc/wk23-obs-szene/media/branch/main/WK23.streamDeckProfile' - file: 'WK23.streamDeckProfile' + - src: 'https://git.chaoswest.tv/winterkongress/wk24-obs-szene/raw/branch/main/WK24.streamDeckProfile' + file: 'WK24.streamDeckProfile' diff --git a/roles/do1jlr.win_streamdeck b/roles/do1jlr.win_streamdeck index 11a77f5..fabf20a 160000 --- a/roles/do1jlr.win_streamdeck +++ b/roles/do1jlr.win_streamdeck @@ -1 +1 @@ -Subproject commit 11a77f595f8d375456ba51df6c21e285102f86ea +Subproject commit fabf20ab0e9630888b791c01e6f21f3f29a3e04b