From 1a32abf5b38f53703c022a97b6ce6e3256af9af0 Mon Sep 17 00:00:00 2001 From: L3D Date: Fri, 11 Oct 2024 22:25:38 +0200 Subject: [PATCH] Start SPS24 preperation --- .../ansible_collections/ansible/windows | 2 +- collections/ansible_collections/chocolatey | 2 +- .../ansible_collections/community/general | 2 +- .../ansible_collections/community/windows | 2 +- group_vars/obs/vars.yml | 48 +++++++++---------- hosts.ini | 4 +- 6 files changed, 29 insertions(+), 31 deletions(-) diff --git a/collections/ansible_collections/ansible/windows b/collections/ansible_collections/ansible/windows index c207ed4..5f859d1 160000 --- a/collections/ansible_collections/ansible/windows +++ b/collections/ansible_collections/ansible/windows @@ -1 +1 @@ -Subproject commit c207ed49ddf73f152f56817787824a2c4ba93226 +Subproject commit 5f859d110c8fc3eabd2bc435ecdd2ab01f3ccd46 diff --git a/collections/ansible_collections/chocolatey b/collections/ansible_collections/chocolatey index c107493..981a967 160000 --- a/collections/ansible_collections/chocolatey +++ b/collections/ansible_collections/chocolatey @@ -1 +1 @@ -Subproject commit c107493580c3af1a87c48ec7e64990ac7f945bde +Subproject commit 981a9677b6ca07a5b0bc668c9f4410453ca54342 diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general index 2140485..67ddb56 160000 --- a/collections/ansible_collections/community/general +++ b/collections/ansible_collections/community/general @@ -1 +1 @@ -Subproject commit 21404851485e2c19f3daac4819fbbece7ada2e94 +Subproject commit 67ddb567c90f6a03dd3a9a3e2c4873c415b07e0d diff --git a/collections/ansible_collections/community/windows b/collections/ansible_collections/community/windows index 588af79..86017d7 160000 --- a/collections/ansible_collections/community/windows +++ b/collections/ansible_collections/community/windows @@ -1 +1 @@ -Subproject commit 588af79d4fb2255c0d1139fd1179c72efa20770b +Subproject commit 86017d76125a4c92f13ff6e91d5a9ba1ac1c8efb diff --git a/group_vars/obs/vars.yml b/group_vars/obs/vars.yml index 9fa8f99..18d82f3 100644 --- a/group_vars/obs/vars.yml +++ b/group_vars/obs/vars.yml @@ -46,31 +46,31 @@ 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://git.chaoswest.tv/winterkongress/dgwk24-video-backgrounds/raw/branch/master/2024/logo.png' - file: 'wk24_logo.png' - - src: 'https://git.chaoswest.tv/winterkongress/dgwk24-video-backgrounds/raw/branch/master/2024/picture_in_picture.png' +# - src: 'https://git.chaoswest.tv/winterkongress/dgwk24-video-backgrounds/raw/branch/master/2024/logo.png' +# file: 'wk24_logo.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://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://git.chaoswest.tv/winterkongress/dgwk24-video-backgrounds/raw/branch/master/2024/plain.png' - file: 'wk24_plain.png' - - src: 'https://git.chaoswest.tv/winterkongress/dgwk24-video-backgrounds/raw/branch/master/2024/three_side_by_side.png' +# file: 'wk24_pip.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://git.chaoswest.tv/winterkongress/dgwk24-video-backgrounds/raw/branch/master/2024/plain.png' +# file: 'wk24_plain.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/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' - 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' +# 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/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' +# 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.chaoswest.tv/winterkongress/wk24-obs-szene/media/branch/main/WK24.streamDeckProfile' - file: 'WK24.streamDeckProfile' +win_streamdeck__icons: [] +# - src: 'https://git.chaoswest.tv/winterkongress/wk24-obs-szene/media/branch/main/WK24.streamDeckProfile' +# file: 'WK24.streamDeckProfile' diff --git a/hosts.ini b/hosts.ini index 4928874..ca08367 100644 --- a/hosts.ini +++ b/hosts.ini @@ -1,4 +1,2 @@ [obs] -obs-hall1 ansible_host="172.30.0.5" -obs-hall2 ansible_host="172.30.0.6" -obs-hall3 ansible_host="172.30.0.3" +obs-sps24 ansible_host="127.0.0.1" ansible_ssh_port='20022'