diff --git a/.gitmodules b/.gitmodules index c3281f1..d70ef5e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,10 +14,6 @@ path = roles/do1jlr.win_parsec url = https://backwesen.de/voc/win_ansible_role_parsec.git branch = main -[submodule "roles/do1jlr.win_synologydrive"] - path = roles/do1jlr.win_synologydrive - url = https://backwesen.de/voc/win_ansible_role_synologydrive.git - branch = main [submodule "roles/do1jlr.win_streamdeck"] path = roles/do1jlr.win_streamdeck url = https://backwesen.de/voc/win_ansible_role_streamdeck.git @@ -29,3 +25,9 @@ [submodule "roles/do1jlr.win_obs_szene"] path = roles/do1jlr.win_obs_szene url = https://backwesen.de/voc/ansible_role_prepare_obs_szene.git +[submodule "roles/do1jlr.ansible_version"] + path = roles/do1jlr.ansible_version + url = https://github.com/roles-ansible/ansible_role_versioncheck.git +[submodule "roles/do1jlr.win_firewall_icmp"] + path = roles/do1jlr.win_firewall_icmp + url = https://backwesen.de/voc/win_ansible_role_firewall_icmp.git diff --git a/.yamllint b/.yamllint index f69cdd3..94460a9 100644 --- a/.yamllint +++ b/.yamllint @@ -2,9 +2,9 @@ extends: default rules: - # 150 chars should be enough, but don't fail if a line is longer + # 200 chars should be enough, but don't fail if a line is longer line-length: - max: 180 + max: 200 level: warning ignore: | diff --git a/README.md b/README.md index 94e4059..956dc48 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,12 @@ Get-Host | Select-Object Version + Check out all [Submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) e.G. with ``git submodule update --init --recursive`` + Configure git to always update submodules on pull: ``git config submodule.recurse true`` + Set up Ansible +---------------- +```bash +ansible-galaxy install -r requirements.yml +``` + Configure Ansible Access (WinRM Setup) ---------------------------------------- diff --git a/group_vars/obs/vars.yml b/group_vars/obs/vars.yml index 25c8c72..0f40e79 100644 --- a/group_vars/obs/vars.yml +++ b/group_vars/obs/vars.yml @@ -19,14 +19,14 @@ win_obs_szene__project: 'swiss_python_summit_2022' win_obs_additional_dirs: [] win_obs_szene_files: -# - src: 'https://backwesen.de/voc/sps22-obs-szene/raw/branch/renderings_2022/2022/rendering/background_fs_logo_plain.png' -# file: 'background_logo_big.png' -# - src: 'https://backwesen.de/voc/sps22-obs-szene/raw/branch/renderings_2022/2022/rendering/background_pip_logo2a.png' -# file: 'background_pip.png' -# - src: 'https://backwesen.de/voc/sps22-obs-szene/raw/branch/renderings_2022/2022/rendering/background_plain.png' -# file: 'background_plain.png' -# - src: 'https://backwesen.de/voc/sps22-obs-szene/raw/branch/renderings_2022/2022/rendering/background_sbs_logo3b.png' -# file: 'background_sbs_2cams.png' + # - src: 'https://backwesen.de/voc/sps22-obs-szene/raw/branch/renderings_2022/2022/rendering/background_fs_logo_plain.png' + # file: 'background_logo_big.png' + # - src: 'https://backwesen.de/voc/sps22-obs-szene/raw/branch/renderings_2022/2022/rendering/background_pip_logo2a.png' + # file: 'background_pip.png' + # - src: 'https://backwesen.de/voc/sps22-obs-szene/raw/branch/renderings_2022/2022/rendering/background_plain.png' + # file: 'background_plain.png' + # - src: 'https://backwesen.de/voc/sps22-obs-szene/raw/branch/renderings_2022/2022/rendering/background_sbs_logo3b.png' + # file: 'background_sbs_2cams.png' - src: 'https://files.zerobyte.ch/files/hidden/dgwk22_music/luss%20dub%20techno%20session%205.mp3' file: 'wk22_background_music.mp3' - src: 'https://www.latofonts.com/download/lato2ofl-zip/' diff --git a/requirements.yml b/requirements.yml new file mode 100644 index 0000000..8b4ceb8 --- /dev/null +++ b/requirements.yml @@ -0,0 +1,19 @@ +--- +roles: [] + +collections: + # Install a collection from Ansible Galaxy. + - name: community.general + version: '>=6.1.0,<7.0.0' + source: https://galaxy.ansible.com + - name: chocolatey.chocolatey + version: '>=1.4.0,<2.0.0' + source: https://galaxy.ansible.com + - name: ansible.windows + version: '>=1.13.0,<2.0.0' + source: https://galaxy.ansible.com + - name: community.windows + version: '>=1.12.0,<2.0.0' + source: https://galaxy.ansible.com + + diff --git a/roles/do1jlr.ansible_version b/roles/do1jlr.ansible_version new file mode 160000 index 0000000..2bf5d7c --- /dev/null +++ b/roles/do1jlr.ansible_version @@ -0,0 +1 @@ +Subproject commit 2bf5d7c4369a8213b42829b14f78920e9906d099 diff --git a/roles/do1jlr.win_base_setup b/roles/do1jlr.win_base_setup index ce8466e..649bb23 160000 --- a/roles/do1jlr.win_base_setup +++ b/roles/do1jlr.win_base_setup @@ -1 +1 @@ -Subproject commit ce8466eb48fdc03fe3d37e6cb62af85996a537da +Subproject commit 649bb23e30b23623b8e2375e74a09556661eb9e3 diff --git a/roles/do1jlr.win_firewall_icmp b/roles/do1jlr.win_firewall_icmp new file mode 160000 index 0000000..92d485b --- /dev/null +++ b/roles/do1jlr.win_firewall_icmp @@ -0,0 +1 @@ +Subproject commit 92d485bea50f289745c81ff7b7c51a7def21bb3a diff --git a/roles/do1jlr.win_obs_setup b/roles/do1jlr.win_obs_setup index 7c30f1a..a000515 160000 --- a/roles/do1jlr.win_obs_setup +++ b/roles/do1jlr.win_obs_setup @@ -1 +1 @@ -Subproject commit 7c30f1aa6354539737fa773254d2299a361cfe29 +Subproject commit a000515372e64202a5ecad7f6a3162b6dfaabf1b diff --git a/roles/do1jlr.win_obs_szene b/roles/do1jlr.win_obs_szene index 11a7510..e398e24 160000 --- a/roles/do1jlr.win_obs_szene +++ b/roles/do1jlr.win_obs_szene @@ -1 +1 @@ -Subproject commit 11a7510966d7f0db156aab1dd06fd57b638544e9 +Subproject commit e398e246dabf82479cbbcb1327e759e6838e4a13 diff --git a/roles/do1jlr.win_parsec b/roles/do1jlr.win_parsec index 182071b..4598a76 160000 --- a/roles/do1jlr.win_parsec +++ b/roles/do1jlr.win_parsec @@ -1 +1 @@ -Subproject commit 182071bea4d3b2ca37178aad1d8f7778a3b5138e +Subproject commit 4598a761e9b7dae3a48c64a3e992de6c98e48ecc diff --git a/roles/do1jlr.win_reaplugs236 b/roles/do1jlr.win_reaplugs236 index c070d99..0e50b12 160000 --- a/roles/do1jlr.win_reaplugs236 +++ b/roles/do1jlr.win_reaplugs236 @@ -1 +1 @@ -Subproject commit c070d993f9ae1ff0fa254c30796789ede57d1831 +Subproject commit 0e50b12e8adba40ad2b235b5294f45ff34d0d3b5 diff --git a/roles/do1jlr.win_streamdeck b/roles/do1jlr.win_streamdeck index 95af4c8..11a77f5 160000 --- a/roles/do1jlr.win_streamdeck +++ b/roles/do1jlr.win_streamdeck @@ -1 +1 @@ -Subproject commit 95af4c879c4d09c8586bb99429df542c00a331a3 +Subproject commit 11a77f595f8d375456ba51df6c21e285102f86ea diff --git a/roles/do1jlr.win_synologydrive b/roles/do1jlr.win_synologydrive deleted file mode 160000 index cf7ea94..0000000 --- a/roles/do1jlr.win_synologydrive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cf7ea9492b782e3227e943e5756880603b5e8d30 diff --git a/roles/do1jlr.win_zeroconf b/roles/do1jlr.win_zeroconf index cbfb331..1eed2ea 160000 --- a/roles/do1jlr.win_zeroconf +++ b/roles/do1jlr.win_zeroconf @@ -1 +1 @@ -Subproject commit cbfb331fe3ed099a7c58b83c7fcc59216ab111b6 +Subproject commit 1eed2ea97fd5142be89acc7a9e3ff7d526768431 diff --git a/site.yml b/site.yml index bc5e11d..fa16e8b 100644 --- a/site.yml +++ b/site.yml @@ -1,13 +1,19 @@ --- -- name: deploy windows users and basic config +- name: Check if ansible is not to old + hosts: localhost + roles: + - {role: do1jlr.ansible_version, tags: [default, version, default, always], gather_facts: false} + + +- name: Deploy windows users and basic config hosts: obs roles: - {role: win_warn_ansible_start, tags: [always, warn]} - {role: do1jlr.win_base_setup, tags: [user, setup]} - {role: do1jlr.win_zeroconf, tags: zeroconf} + - {role: do1jlr.win_firewall_icmp, tags: firewall} - {role: do1jlr.win_obs_setup, tags: [user, obs]} - {role: do1jlr.win_parsec, tags: parsec} - - {role: do1jlr.win_synologydrive, tags: [synology, nas, synologydrive]} - {role: do1jlr.win_streamdeck, tags: streamdeck} - {role: do1jlr.win_reaplugs236, tags: [reaper, obs, reaplugs236, reaplugs]} - {role: do1jlr.win_obs_szene, tags: [obs, szene]}