Compare commits

..

No commits in common. "be51bcdcbb7f45d01efedc30e2baedc3c4944d2f" and "1299bc6c70141d4b60828b3a7502a99aa7bcbc27" have entirely different histories.

5 changed files with 5 additions and 12 deletions

9
.gitmodules vendored
View file

@ -7,6 +7,9 @@
[submodule "roles/win_activating"] [submodule "roles/win_activating"]
path = roles/win_activating path = roles/win_activating
url = https://git.l3d.ch/voc/win_ansible_role_activating.git url = https://git.l3d.ch/voc/win_ansible_role_activating.git
[submodule "collections/ansible_collections/ansible/windows"]
path = collections/ansible_collections/ansible/windows
url = https://github.com/ansible-collections/community.windows
[submodule "collections/ansible_collections/chocolatey"] [submodule "collections/ansible_collections/chocolatey"]
path = collections/ansible_collections/chocolatey path = collections/ansible_collections/chocolatey
url = https://github.com/chocolatey/chocolatey-ansible.git url = https://github.com/chocolatey/chocolatey-ansible.git
@ -19,9 +22,3 @@
[submodule "roles/l3d.wireguard"] [submodule "roles/l3d.wireguard"]
path = roles/l3d.wireguard path = roles/l3d.wireguard
url = https://git.l3d.ch/win_ansible/ansible_role_win_wireguard.git url = https://git.l3d.ch/win_ansible/ansible_role_win_wireguard.git
[submodule "roles/l3d.choco"]
path = roles/l3d.choco
url = https://git.l3d.ch/win_ansible/ansible_role_win_chocolatey.git
[submodule "collections/ansible_collections/ansible/windows"]
path = collections/ansible_collections/ansible/windows
url = https://github.com/ansible-collections/ansible.windows.git

@ -1 +1 @@
Subproject commit c207ed49ddf73f152f56817787824a2c4ba93226 Subproject commit 588af79d4fb2255c0d1139fd1179c72efa20770b

View file

@ -2,8 +2,6 @@
## connect to windows ## connect to windows
ansible_connection: 'ssh' ansible_connection: 'ssh'
ansible_shell_type: 'powershell' ansible_shell_type: 'powershell'
ansible_pipelining: true
ansible_password: "{{ lookup('community.general.passwordstore', 'ansible/windows/' + inventory_hostname + '/login/' + ansible_user) }}"
# win_activating # win_activating
windows_product_key: "{{ lookup('community.general.passwordstore', 'ansible/windows/productkey') }}" windows_product_key: "{{ lookup('community.general.passwordstore', 'ansible/windows/productkey') }}"

@ -1 +0,0 @@
Subproject commit 5322f83dfb4385e2fe9d9db1a47220daf3e99cd5

View file

@ -8,8 +8,7 @@
- name: Deploy windows users and basic config - name: Deploy windows users and basic config
hosts: desktop hosts: desktop
roles: roles:
- {role: l3d.choco, tags: choco}
- {role: win_activating, tags: zeroconf} - {role: win_activating, tags: zeroconf}
- {role: win_zeroconf, tags: zeroconf} - {role: win_zeroconf, tags: zeroconf}
# - {role: win_gopass, tags: gopass} - {role: win_gopass, tags: gopass}
- {role: l3d.wireguard, tags: wireguard} - {role: l3d.wireguard, tags: wireguard}