diff --git a/group_vars/obs/vars.yml b/group_vars/obs/vars.yml index 1315a4b..9b2424c 100644 --- a/group_vars/obs/vars.yml +++ b/group_vars/obs/vars.yml @@ -33,7 +33,7 @@ win__allow_special_rdp_user: true # define obs szene -win_obs_szene__project: 'swiss_python_summit_2022' +win_obs_szene__project: 'wk23' # TODO: Artwork einfuegen, wenn verfuegbar! win_obs_additional_dirs: [] diff --git a/hosts.ini b/hosts.ini index e4f5581..2cc7525 100644 --- a/hosts.ini +++ b/hosts.ini @@ -1,5 +1,6 @@ [obs] obs-white ansible_host=obs-white.local -obs-yellow ansible_host=obs-yellow.local +obs-yellow ansible_host=10.10.0.211 +# obs-yellow.local obs-blue ansible_host=obs-blue.local obs-misc ansible_host=obs-misc.local diff --git a/roles/do1jlr.win_rdp b/roles/do1jlr.win_rdp index f6452a9..c056aa8 160000 --- a/roles/do1jlr.win_rdp +++ b/roles/do1jlr.win_rdp @@ -1 +1 @@ -Subproject commit f6452a9a402c4e2bd476a48397057590c71fb0c5 +Subproject commit c056aa8dd86c2fa4c00e4b66e3095df86cf8ae92 diff --git a/roles/setup_secrets/tasks/main.yml b/roles/setup_secrets/tasks/main.yml new file mode 100644 index 0000000..bf50014 --- /dev/null +++ b/roles/setup_secrets/tasks/main.yml @@ -0,0 +1,10 @@ +--- +- name: Create obs flder + ansible.windows.win_file: + path: 'C:\obs\' + state: directory + +- name: Deploy Setup Secrets + ansible.windows.win_template: + src: 'templates/secrets.txt.j2' + dest: 'C:\obs\secrets.txt' diff --git a/roles/setup_secrets/templates/secrets.txt.j2 b/roles/setup_secrets/templates/secrets.txt.j2 new file mode 100644 index 0000000..ef5a396 --- /dev/null +++ b/roles/setup_secrets/templates/secrets.txt.j2 @@ -0,0 +1,12 @@ +{{ ansible_managed | comment }} + +Streaming Keys: +{% for host in groups['obs'] %} ++ {{ hostvars[host]['ansible_host'] }}: + {{ lookup('community.general.passwordstore', 'chvoc/ansible/windows/' + inventory_hostname + '/portier/streamkey') }} +{% endfor %} + + +Parsec: ++ Login: chvoc@l3d.yt + PWD: {{ lookup('community.general.passwordstore', 'chvoc/websites/parsec.app/chvoc@l3d.yt') }} diff --git a/site.yml b/site.yml index 1d65a8a..c754bc3 100644 --- a/site.yml +++ b/site.yml @@ -12,11 +12,12 @@ - {role: do1jlr.win_winerm, tags: winrm} - {role: do1jlr.win_base_setup, tags: [user, setup]} - {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_obs_setup, tags: [user, obs]} - {role: do1jlr.win_parsec, tags: parsec} - {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]}