From b52acf6df8f991e76d1741c0af3a4cb43b7ba38c Mon Sep 17 00:00:00 2001 From: L3D Date: Sun, 1 Jan 2023 03:53:28 +0100 Subject: [PATCH] update wk23 stuff --- group_vars/obs/vars.yml | 4 +++- roles/do1jlr.win_obs_szene | 2 +- roles/setup_secrets/templates/secrets.txt.j2 | 2 +- site.yml | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/group_vars/obs/vars.yml b/group_vars/obs/vars.yml index 5774f6a..89338cb 100644 --- a/group_vars/obs/vars.yml +++ b/group_vars/obs/vars.yml @@ -56,8 +56,10 @@ win_obs_szene_files: file: 'wk22_background_music.mp3' - src: 'https://www.latofonts.com/download/lato2ofl-zip/' file: 'Lato2OFL.zip' + - src: 'https://backwesen.de/voc/wk23-obs-szene/raw/branch/main/wk23.json' + file: 'wk23.json' -win_streamdeck__download_icons: true +win_streamdeck__download_icons: false win_streamdeck__icons: [] # - src: 'https://files.l3d.ch/share/sd-icons-master.zip' # file: 'icons.zip' diff --git a/roles/do1jlr.win_obs_szene b/roles/do1jlr.win_obs_szene index e398e24..f108d30 160000 --- a/roles/do1jlr.win_obs_szene +++ b/roles/do1jlr.win_obs_szene @@ -1 +1 @@ -Subproject commit e398e246dabf82479cbbcb1327e759e6838e4a13 +Subproject commit f108d30f1b2d75eca1469d540ad8dda9c327af8c diff --git a/roles/setup_secrets/templates/secrets.txt.j2 b/roles/setup_secrets/templates/secrets.txt.j2 index ef5a396..82785fd 100644 --- a/roles/setup_secrets/templates/secrets.txt.j2 +++ b/roles/setup_secrets/templates/secrets.txt.j2 @@ -3,7 +3,7 @@ Streaming Keys: {% for host in groups['obs'] %} + {{ hostvars[host]['ansible_host'] }}: - {{ lookup('community.general.passwordstore', 'chvoc/ansible/windows/' + inventory_hostname + '/portier/streamkey') }} + {{ lookup('community.general.passwordstore', 'chvoc/ansible/windows/' + hostvars[host]['inventory_hostname'] + '/portier/streamkey') }} {% endfor %} diff --git a/site.yml b/site.yml index ee7e910..9bb2ad7 100644 --- a/site.yml +++ b/site.yml @@ -21,4 +21,4 @@ - {role: do1jlr.win_streamdeck, tags: streamdeck} - {role: do1jlr.win_reaplugs236, tags: [reaper, obs, reaplugs236, reaplugs]} - {role: do1jlr.win_obs_szene, tags: [obs, szene]} - - {role: setup_secrets, tags: [secrets]} + - {role: setup_secrets, tags: [secret]}