From 707a4749a96fcedaebf02ba60ea0750f43e9069c Mon Sep 17 00:00:00 2001 From: L3D Date: Tue, 17 Feb 2026 00:35:04 +0100 Subject: [PATCH] Optimize config for wk26 --- collections/ansible_collections/ansible/windows | 2 +- collections/ansible_collections/chocolatey | 2 +- collections/ansible_collections/community/general | 2 +- collections/ansible_collections/community/windows | 2 +- group_vars/obs/vars.yml | 15 +++++---------- host_vars/obs-sps24.yml | 5 ----- hosts.ini | 4 +++- site.yml | 14 +++----------- 8 files changed, 15 insertions(+), 31 deletions(-) delete mode 100644 host_vars/obs-sps24.yml diff --git a/collections/ansible_collections/ansible/windows b/collections/ansible_collections/ansible/windows index 5f859d1..23852b7 160000 --- a/collections/ansible_collections/ansible/windows +++ b/collections/ansible_collections/ansible/windows @@ -1 +1 @@ -Subproject commit 5f859d110c8fc3eabd2bc435ecdd2ab01f3ccd46 +Subproject commit 23852b7e0a85494e7dfa765b0da5c386e891b147 diff --git a/collections/ansible_collections/chocolatey b/collections/ansible_collections/chocolatey index 981a967..8d9f88b 160000 --- a/collections/ansible_collections/chocolatey +++ b/collections/ansible_collections/chocolatey @@ -1 +1 @@ -Subproject commit 981a9677b6ca07a5b0bc668c9f4410453ca54342 +Subproject commit 8d9f88b36f753faa757ba1967090a90044045976 diff --git a/collections/ansible_collections/community/general b/collections/ansible_collections/community/general index 67ddb56..85a0dee 160000 --- a/collections/ansible_collections/community/general +++ b/collections/ansible_collections/community/general @@ -1 +1 @@ -Subproject commit 67ddb567c90f6a03dd3a9a3e2c4873c415b07e0d +Subproject commit 85a0deeebad26a7473be4640d80c818d1c98794f diff --git a/collections/ansible_collections/community/windows b/collections/ansible_collections/community/windows index 86017d7..63be124 160000 --- a/collections/ansible_collections/community/windows +++ b/collections/ansible_collections/community/windows @@ -1 +1 @@ -Subproject commit 86017d76125a4c92f13ff6e91d5a9ba1ac1c8efb +Subproject commit 63be124ccec957d696537342d2281e5416a3b8d1 diff --git a/group_vars/obs/vars.yml b/group_vars/obs/vars.yml index 12a2068..b9d58bf 100644 --- a/group_vars/obs/vars.yml +++ b/group_vars/obs/vars.yml @@ -1,7 +1,7 @@ --- # user for ansible login -ansible_user: ansible -voc_user: obs +ansible_user: voc +voc_user: voc win_obs_init__user: "{{ voc_user }}" @@ -15,15 +15,10 @@ ansible_connection: ssh ansible_shell_type: "powershell" ansible_winrm_server_cert_validation: ignore ansible_pipelining: true -ansible_password: "{{ lookup('community.general.passwordstore', 'chvoc/ansible/windows/' + inventory_hostname + '/login/' + ansible_user) }}" - -# credetials -gopass_password_prefix: 'chvoc/ansible/windows/' -win_base_init__created_user_password: "{{ lookup('community.general.passwordstore', gopass_password_prefix + inventory_hostname + '/login/ansible create=true length=64 nosymbols=true') }}" -win_obs_init__password: "{{ lookup('community.general.passwordstore', gopass_password_prefix + inventory_hostname + '/login/' + voc_user + ' create=true length=8 nosymbols=true') }}" +#ansible_password: "{{ lookup('community.general.passwordstore', 'chvoc/ansible/windows/' + inventory_hostname + '/login/' + ansible_user) }}" # manage autologon -win_obs_init__autologon: true +win_obs_init__autologon: false win_obs_init__autologon_password: "{{ lookup('community.general.passwordstore', 'chvoc/ansible/windows/' + inventory_hostname + '/login/' + voc_user) }}" # users @@ -34,7 +29,7 @@ win__special_rdp_user: "{{ voc_user }}" win__allow_special_rdp_user: true # windows product key -windows_product_key: "{{ lookup('community.general.passwordstore', 'chvoc/ansible/windows/productkey') }}" +windows_product_key: "{{ lookup('community.general.passwordstore', 'ansible/windows/productkey') }}" # define obs szene win_obs_szene__project: 'sps24' diff --git a/host_vars/obs-sps24.yml b/host_vars/obs-sps24.yml deleted file mode 100644 index c81c641..0000000 --- a/host_vars/obs-sps24.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -ansible_user: 'ansible' -task__sound_muted: true -task__sound_obs: true -task__obs_firewall: true diff --git a/hosts.ini b/hosts.ini index fc47363..01bc814 100644 --- a/hosts.ini +++ b/hosts.ini @@ -1,2 +1,4 @@ [obs] -obs-sps24 ansible_host="100.64.0.4" +hall1 ansible_host="192.168.202.21" +hall2 ansible_host="192.168.202.22" +hall3 ansible_host="192.168.202.23" diff --git a/site.yml b/site.yml index 848586e..7f6ffa8 100644 --- a/site.yml +++ b/site.yml @@ -8,25 +8,17 @@ - name: Deploy windows users and basic config hosts: obs roles: - - {role: win_warn_ansible_start, tags: [always, warn]} - {role: l3d.choco, tags: chocolatey} - {role: do1jlr.win_activation, tags: [task]} - {role: do1jlr.win_winerm, tags: winrm} - - {role: do1jlr.win_base_setup, tags: [user, setup]} + # - {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_streamdeck, tags: streamdeck} + # - {role: do1jlr.win_sshd, tags: sshd} - {role: l3d.time, tags: time} # - {role: l3d.wireguard, tags: wireguard} - - {role: l3d.loudnessdock, tags: dock} - - {role: l3d.loudness_meter, tags: loudness} +# - {role: l3d.loudnessdock, tags: dock} - {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: do1jlr.win_nextcloud, tags: nextcloud} # currently instalaltion not working - - {role: setup_secrets, tags: [secret]} - - {role: important_tasks, tags: tasks}