diff --git a/group_vars/obs/vars.yml b/group_vars/obs/vars.yml index 18d82f3..12a2068 100644 --- a/group_vars/obs/vars.yml +++ b/group_vars/obs/vars.yml @@ -37,7 +37,7 @@ win__allow_special_rdp_user: true windows_product_key: "{{ lookup('community.general.passwordstore', 'chvoc/ansible/windows/productkey') }}" # define obs szene -win_obs_szene__project: 'wk24' +win_obs_szene__project: 'sps24' # TODO: Artwork einfuegen, wenn verfuegbar! win_obs_additional_dirs: ['obs-config'] wallpaper_path: 'C:\obs\{{ win_obs_szene__project }}\background.png' @@ -46,31 +46,28 @@ 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/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' -# - src: 'https://git.chaoswest.tv/winterkongress/wk23-obs-szene/media/branch/main/schema/background_schema_3sources.png' -# file: 'wk24_sbs_x3.png' + - src: 'https://git.chaoswest.tv/python-summit/sps-video-backgrounds/raw/branch/renderings_2024/2024/rendered/background_fs_logo_plain.png' + file: 'sps24_logo.png' + - src: 'https://git.chaoswest.tv/python-summit/sps-video-backgrounds/raw/branch/renderings_2024/2024/rendered/background_pip_logo1a.png' + file: 'sps24_pip.png' + - src: 'https://git.chaoswest.tv/python-summit/sps-video-backgrounds/raw/branch/renderings_2024/2024/rendered/background_sbs_logo1a.png' + file: 'sps24_sbs_x2.png' + - src: 'https://git.chaoswest.tv/python-summit/sps-video-backgrounds/raw/branch/renderings_2024/2024/rendered/background_plain.png' + file: 'sps24_plain.png' + - src: 'https://git.chaoswest.tv/python-summit/sps-video-backgrounds/raw/branch/renderings_2024/2024/rendered/background_tbs_logo3a.png' + file: 'sps24_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' + - src: "https://git.chaoswest.tv/winterkongress/wk24-obs-szene/raw/branch/main/obs-scene/obs-hall1.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/host_vars/obs-hall1.yml b/host_vars/obs-hall1.yml deleted file mode 100644 index fee0632..0000000 --- a/host_vars/obs-hall1.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -# ansible_user: 'Voc_Admin' -task__sound_muted: false -task__sound_obs: false -task__obs_firewall: false diff --git a/host_vars/obs-hall2.yml b/host_vars/obs-hall2.yml deleted file mode 100644 index 7ef32bd..0000000 --- a/host_vars/obs-hall2.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -# ansible_user: 'voc' -task__sound_muted: false -task__sound_obs: false -task__obs_firewall: false diff --git a/host_vars/obs-hall3.yml b/host_vars/obs-hall3.yml deleted file mode 100644 index 7ef32bd..0000000 --- a/host_vars/obs-hall3.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -# ansible_user: 'voc' -task__sound_muted: false -task__sound_obs: false -task__obs_firewall: false diff --git a/host_vars/obs-sps24.yml b/host_vars/obs-sps24.yml new file mode 100644 index 0000000..6088a1a --- /dev/null +++ b/host_vars/obs-sps24.yml @@ -0,0 +1,5 @@ +--- +ansible_user: 'voc' +task__sound_muted: true +task__sound_obs: true +task__obs_firewall: true diff --git a/hosts.ini b/hosts.ini index ca08367..fc47363 100644 --- a/hosts.ini +++ b/hosts.ini @@ -1,2 +1,2 @@ [obs] -obs-sps24 ansible_host="127.0.0.1" ansible_ssh_port='20022' +obs-sps24 ansible_host="100.64.0.4" diff --git a/site.yml b/site.yml index 2e41594..848586e 100644 --- a/site.yml +++ b/site.yml @@ -13,20 +13,20 @@ - {role: do1jlr.win_activation, tags: [task]} - {role: do1jlr.win_winerm, tags: winrm} - {role: do1jlr.win_base_setup, tags: [user, setup]} - - {role: do1jlr.win_zeroconf, tags: zeroconf} + # - {role: do1jlr.win_zeroconf, tags: zeroconf} - {role: do1jlr.win_obs_setup, tags: [user, obs]} - {role: do1jlr.win_firewall_icmp, tags: firewall} - {role: do1jlr.win_sshd, tags: sshd} - {role: do1jlr.win_rdp, tags: rdp} - {role: do1jlr.win_streamdeck, tags: streamdeck} - {role: l3d.time, tags: time} - - {role: l3d.wireguard, tags: wireguard} +# - {role: l3d.wireguard, tags: wireguard} - {role: l3d.loudnessdock, tags: dock} - {role: l3d.loudness_meter, tags: loudness} - {role: do1jlr.win_reaplugs236, tags: [reaper, obs, reaplugs236, reaplugs]} - {role: do1jlr.win_obs_szene, tags: [obs, szene]} - - {role: l3d.exporter, tags: monitoring} - - {role: l3d.obs_exporter, tags: exporter} + # - {role: l3d.exporter, tags: monitoring} + # - {role: l3d.obs_exporter, tags: exporter} # - {role: do1jlr.win_nextcloud, tags: nextcloud} # currently instalaltion not working - {role: setup_secrets, tags: [secret]} - {role: important_tasks, tags: tasks}