From 888590ed9f028aaf68bd8915e77a1c6f09bdb5e7 Mon Sep 17 00:00:00 2001 From: NaeiKinDus Date: Sun, 23 Feb 2025 00:00:00 +0000 Subject: [PATCH] chore!: separated galaxy deps and own collections; modified ansible script generation to use two paths for collections REQUIRES REGENERATING ansible.cfg! --- .gitignore | 12 ++++++------ .../nullified/infrastructure/README.md | 0 .../extensions/molecule/default/converge.yml | 0 .../extensions/molecule/default/create.yml | 0 .../extensions/molecule/default/destroy.yml | 0 .../extensions/molecule/default/molecule.yml | 0 .../molecule/default/platform_vars.yml | 0 .../molecule/default/requirements.yml | 0 .../molecule/default/tasks/create-fail.yml | 0 .../nullified/infrastructure/galaxy.yml | 0 .../nullified/infrastructure/logs/.gitkeep | 0 .../nullified/infrastructure/meta/runtime.yml | 0 .../nullified/infrastructure/plugins/README.md | 0 .../plugins/modules/github_artifact.py | 0 .../plugins/tests/github_artifact.json | 0 .../fonts/JetBrainsMonoNerdFontMono-Bold.ttf | 0 .../JetBrainsMonoNerdFontMono-BoldItalic.ttf | 0 .../fonts/JetBrainsMonoNerdFontMono-Italic.ttf | 0 .../JetBrainsMonoNerdFontMono-Regular.ttf | 0 .../fonts/Meslo LG S NF Mono Bold Italic.ttf | 0 .../assets/fonts/Meslo LG S NF Mono Bold.ttf | 0 .../assets/fonts/Meslo LG S NF Mono Italic.ttf | 0 .../fonts/Meslo LG S NF Mono Regular.ttf | 0 .../roles/common/defaults/main.yml | 0 .../roles/common/handlers/main.yml | 0 .../infrastructure/roles/common/meta/main.yml | 0 .../roles/common/tasks/home_setup.yml | 0 .../infrastructure/roles/common/tasks/main.yml | 3 ++- .../roles/common/tasks/shell_customization.yml | 0 .../roles/common/templates/home/.gitconfig.j2 | 0 .../roles/common/templates/home/.lessfilter | 0 .../roles/common/templates/home/.p10k.zsh | 0 .../roles/common/templates/home/.pythonrc | 0 .../roles/common/templates/home/.zsh_aliases | 0 .../common/templates/home/.zsh_completions | 0 .../roles/common/templates/home/.zsh_exports | 0 .../roles/common/templates/home/.zsh_functions | 0 .../roles/common/templates/home/.zshrc | 0 .../roles/common/tests/inventory | 0 .../infrastructure/roles/common/vars/main.yml | 0 .../roles/development/defaults/main.yml | 0 .../roles/development/handlers/main.yml | 0 .../roles/development/meta/main.yml | 0 .../roles/development/tasks/main.yml | 0 .../templates/docker-ce/daemon.json.j2 | 0 .../roles/development/tests/inventory | 0 .../roles/development/vars/main.yml | 0 .../roles/gaming/defaults/main.yml | 0 .../roles/gaming/handlers/main.yml | 0 .../infrastructure/roles/gaming/meta/main.yml | 0 .../infrastructure/roles/gaming/tasks/main.yml | 0 .../roles/gaming/tests/inventory | 0 .../infrastructure/roles/gaming/vars/main.yml | 0 .../infrastructure/roles/helm/README.md | 0 .../roles/helm/defaults/main.yml | 0 .../roles/helm/handlers/main.yml | 0 .../infrastructure/roles/helm/meta/main.yml | 0 .../infrastructure/roles/helm/tasks/main.yml | 0 .../infrastructure/roles/helm/tests/inventory | 0 .../infrastructure/roles/helm/tests/test.yml | 0 .../infrastructure/roles/helm/vars/main.yml | 0 .../infrastructure/roles/k3s/defaults/main.yml | 0 .../infrastructure/roles/k3s/handlers/main.yml | 0 .../infrastructure/roles/k3s/meta/main.yml | 0 .../infrastructure/roles/k3s/tasks/agent.yml | 0 .../infrastructure/roles/k3s/tasks/main.yml | 0 .../roles/k3s/tasks/opentofu.yml | 0 .../infrastructure/roles/k3s/tasks/server.yml | 0 .../k3s/templates/nftables.d/k3s_agents.nft.j2 | 0 .../templates/nftables.d/k3s_servers.nft.j2 | 0 .../infrastructure/roles/k3s/tests/inventory | 0 .../infrastructure/roles/k3s/vars/main.yml | 0 .../infrastructure/roles/kubectl/README.md | 0 .../roles/kubectl/defaults/main.yml | 0 .../roles/kubectl/handlers/main.yml | 0 .../infrastructure/roles/kubectl/meta/main.yml | 0 .../roles/kubectl/tasks/main.yml | 0 .../roles/kubectl/tests/inventory | 0 .../roles/kubectl/tests/test.yml | 0 .../infrastructure/roles/kubectl/vars/main.yml | 0 .../roles/mariadb/defaults/main.yml | 0 .../roles/mariadb/handlers/main.yml | 0 .../infrastructure/roles/mariadb/meta/main.yml | 0 .../roles/mariadb/tasks/client.yml | 0 .../roles/mariadb/tasks/main.yml | 0 .../roles/mariadb/tasks/server.yml | 0 .../mariadb/templates/mariadb_init.sql.j2 | 0 .../templates/nftables.d/mariadb.nft.j2 | 0 .../roles/mariadb/tests/inventory | 0 .../infrastructure/roles/mariadb/vars/main.yml | 0 .../roles/nginx/defaults/main.yml | 0 .../roles/nginx/handlers/main.yml | 0 .../infrastructure/roles/nginx/meta/main.yml | 0 .../infrastructure/roles/nginx/tasks/main.yml | 0 .../roles/nginx/tasks/nginx-config.yml | 0 .../roles/nginx/tasks/nginx-service-entry.yml | 0 .../nginx/templates/ingress_http_nginx.nft.j2 | 0 .../roles/nginx/templates/nginx.conf.j2 | 0 .../roles/nginx/templates/nginx_limits.conf.j2 | 0 .../infrastructure/roles/nginx/tests/inventory | 0 .../infrastructure/roles/nginx/tests/test.yml | 0 .../infrastructure/roles/nginx/vars/main.yml | 0 .../roles/postgresql/defaults/main.yml | 0 .../roles/postgresql/handlers/main.yml | 0 .../roles/postgresql/meta/main.yml | 0 .../roles/postgresql/tasks/client.yml | 0 .../roles/postgresql/tasks/main.yml | 0 .../roles/postgresql/tasks/server.yml | 0 .../templates/nftables.d/postgresql.nft.j2 | 0 .../templates/postgresql_init.sql.j2 | 0 .../roles/postgresql/tests/inventory | 0 .../roles/postgresql/tests/test.yml | 0 .../roles/postgresql/vars/main.yml | 0 .../roles/provisioner/defaults/main.yml | 0 .../roles/provisioner/handlers/main.yml | 0 .../roles/provisioner/meta/main.yml | 0 .../roles/provisioner/tasks/load_facts.yml | 0 .../roles/provisioner/tasks/main.yml | 0 .../roles/provisioner/tests/inventory | 0 .../roles/provisioner/vars/main.yml | 0 .../roles/security/defaults/main.yml | 0 .../roles/security/handlers/main.yml | 0 .../roles/security/meta/main.yml | 0 .../roles/security/tasks/firewall.yml | 0 .../roles/security/tasks/main.yml | 0 .../templates/clamav/clamav-clamd.service.j2 | 0 .../clamav/clamav-freshclam.service.j2 | 0 .../templates/clamav/clamav-milter.conf.j2 | 0 .../security/templates/clamav/clamd.conf.j2 | 0 .../templates/clamav/freshclam.conf.j2 | 0 .../sshd_config.d/encryption.conf.j2 | 0 .../templates/openssh-server/sshd_config.j2 | 0 .../templates/rkhunter/rkhunter.conf.local.j2 | 0 .../templates/system/debian/limits.conf.j2 | 0 .../templates/system/debian/login.defs.j2 | 0 .../templates/system/debian/nftables.conf.j2 | 0 .../templates/system/debian/resolv.conf.j2 | 0 .../system/debian/sysctld.local.conf.j2 | 0 .../system/nftables.d/egress_http.nft.j2 | 0 .../system/nftables.d/egress_icmp.nft.j2 | 0 .../system/nftables.d/ingress_icmp.nft.j2 | 0 .../templates/system/nftables/01-nat.table.j2 | 0 .../system/nftables/02-mangle.table.j2 | 0 .../system/nftables/03-filter.table.j2 | 0 .../roles/security/tests/inventory | 0 .../roles/security/vars/main.yml | 0 .../roles/server/defaults/main.yml | 0 .../roles/server/handlers/main.yml | 0 .../infrastructure/roles/server/meta/main.yml | 0 .../infrastructure/roles/server/tasks/main.yml | 0 .../roles/server/tests/inventory | 0 .../infrastructure/roles/server/vars/main.yml | 0 .../roles/vault/defaults/main.yml | 0 .../roles/vault/handlers/main.yml | 0 .../infrastructure/roles/vault/meta/main.yml | 0 .../roles/vault/tasks/initialize.yml | 0 .../roles/vault/tasks/install_binary.yml | 0 .../roles/vault/tasks/install_service.yml | 0 .../infrastructure/roles/vault/tasks/main.yml | 0 .../roles/vault/tasks/prerequisites.yml | 0 .../roles/vault/tasks/security.yml | 0 .../roles/vault/templates/config.hcl.j2 | 0 .../roles/vault/templates/env.j2 | 0 .../vault/templates/vault-unit.service.j2 | 0 .../roles/vault/templates/vault.nft.j2 | 0 .../infrastructure/roles/vault/tests/inventory | 0 .../infrastructure/roles/vault/vars/main.yml | 0 .../roles/workstation/defaults/main.yml | 0 .../roles/workstation/handlers/main.yml | 0 .../roles/workstation/meta/main.yml | 0 .../roles/workstation/tasks/main.yml | 6 +++--- .../roles/workstation/tasks/window_manager.yml | 18 +++++++++--------- .../templates/.config/awesome/background.png | 0 .../templates/.config/awesome/battery.lua | 0 .../templates/.config/awesome/rc.lua | 0 .../themes/powerarrow/theme-personal.lua | 0 .../templates/.config/terminator/config | 0 .../workstation/templates/.config/vlc/vlcrc | 0 .../roles/workstation/templates/.xsession | 0 .../workstation/templates/bin_wrapper.sh.j2 | 0 .../roles/workstation/templates/desktop_app.j2 | 0 .../workstation/templates/system/xorg.conf | 0 .../roles/workstation/tests/inventory | 0 .../roles/workstation/vars/main.yml | 0 .../nullified/infrastructure/tests/config.yml | 0 .../tests/sanity/ignore-2.15.txt | 0 .../infrastructure/extensions/ansible.cfg | 8 -------- scripts/generate_ansible_config.sh | 13 ++++++++++--- 188 files changed, 30 insertions(+), 30 deletions(-) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/README.md (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/extensions/molecule/default/converge.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/extensions/molecule/default/create.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/extensions/molecule/default/destroy.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/extensions/molecule/default/molecule.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/extensions/molecule/default/platform_vars.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/extensions/molecule/default/requirements.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/extensions/molecule/default/tasks/create-fail.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/galaxy.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/logs/.gitkeep (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/meta/runtime.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/plugins/README.md (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/plugins/modules/github_artifact.py (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/plugins/tests/github_artifact.json (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-Bold.ttf (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-BoldItalic.ttf (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-Italic.ttf (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-Regular.ttf (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Bold Italic.ttf (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Bold.ttf (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Italic.ttf (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Regular.ttf (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/defaults/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/handlers/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/meta/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/tasks/home_setup.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/tasks/main.yml (98%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/tasks/shell_customization.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/templates/home/.gitconfig.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/templates/home/.lessfilter (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/templates/home/.p10k.zsh (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/templates/home/.pythonrc (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/templates/home/.zsh_aliases (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/templates/home/.zsh_completions (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/templates/home/.zsh_exports (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/templates/home/.zsh_functions (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/templates/home/.zshrc (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/tests/inventory (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/common/vars/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/development/defaults/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/development/handlers/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/development/meta/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/development/tasks/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/development/templates/docker-ce/daemon.json.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/development/tests/inventory (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/development/vars/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/gaming/defaults/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/gaming/handlers/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/gaming/meta/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/gaming/tasks/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/gaming/tests/inventory (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/gaming/vars/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/helm/README.md (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/helm/defaults/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/helm/handlers/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/helm/meta/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/helm/tasks/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/helm/tests/inventory (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/helm/tests/test.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/helm/vars/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/k3s/defaults/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/k3s/handlers/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/k3s/meta/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/k3s/tasks/agent.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/k3s/tasks/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/k3s/tasks/opentofu.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/k3s/tasks/server.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/k3s/templates/nftables.d/k3s_agents.nft.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/k3s/templates/nftables.d/k3s_servers.nft.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/k3s/tests/inventory (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/k3s/vars/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/kubectl/README.md (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/kubectl/defaults/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/kubectl/handlers/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/kubectl/meta/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/kubectl/tasks/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/kubectl/tests/inventory (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/kubectl/tests/test.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/kubectl/vars/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/mariadb/defaults/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/mariadb/handlers/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/mariadb/meta/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/mariadb/tasks/client.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/mariadb/tasks/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/mariadb/tasks/server.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/mariadb/templates/mariadb_init.sql.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/mariadb/templates/nftables.d/mariadb.nft.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/mariadb/tests/inventory (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/mariadb/vars/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/nginx/defaults/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/nginx/handlers/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/nginx/meta/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/nginx/tasks/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/nginx/tasks/nginx-config.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/nginx/tasks/nginx-service-entry.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/nginx/templates/ingress_http_nginx.nft.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/nginx/templates/nginx.conf.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/nginx/templates/nginx_limits.conf.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/nginx/tests/inventory (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/nginx/tests/test.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/nginx/vars/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/postgresql/defaults/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/postgresql/handlers/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/postgresql/meta/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/postgresql/tasks/client.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/postgresql/tasks/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/postgresql/tasks/server.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/postgresql/templates/nftables.d/postgresql.nft.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/postgresql/templates/postgresql_init.sql.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/postgresql/tests/inventory (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/postgresql/tests/test.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/postgresql/vars/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/provisioner/defaults/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/provisioner/handlers/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/provisioner/meta/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/provisioner/tasks/load_facts.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/provisioner/tasks/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/provisioner/tests/inventory (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/provisioner/vars/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/defaults/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/handlers/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/meta/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/tasks/firewall.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/tasks/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/clamav/clamav-clamd.service.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/clamav/clamav-freshclam.service.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/clamav/clamav-milter.conf.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/clamav/clamd.conf.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/clamav/freshclam.conf.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/openssh-server/sshd_config.d/encryption.conf.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/openssh-server/sshd_config.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/rkhunter/rkhunter.conf.local.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/system/debian/limits.conf.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/system/debian/login.defs.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/system/debian/nftables.conf.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/system/debian/resolv.conf.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/system/debian/sysctld.local.conf.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/system/nftables.d/egress_http.nft.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/system/nftables.d/egress_icmp.nft.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/system/nftables.d/ingress_icmp.nft.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/system/nftables/01-nat.table.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/system/nftables/02-mangle.table.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/templates/system/nftables/03-filter.table.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/tests/inventory (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/security/vars/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/server/defaults/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/server/handlers/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/server/meta/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/server/tasks/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/server/tests/inventory (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/server/vars/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/vault/defaults/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/vault/handlers/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/vault/meta/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/vault/tasks/initialize.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/vault/tasks/install_binary.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/vault/tasks/install_service.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/vault/tasks/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/vault/tasks/prerequisites.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/vault/tasks/security.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/vault/templates/config.hcl.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/vault/templates/env.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/vault/templates/vault-unit.service.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/vault/templates/vault.nft.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/vault/tests/inventory (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/vault/vars/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/workstation/defaults/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/workstation/handlers/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/workstation/meta/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/workstation/tasks/main.yml (98%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/workstation/tasks/window_manager.yml (92%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/workstation/templates/.config/awesome/background.png (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/workstation/templates/.config/awesome/battery.lua (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/workstation/templates/.config/awesome/rc.lua (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/workstation/templates/.config/awesome/themes/powerarrow/theme-personal.lua (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/workstation/templates/.config/terminator/config (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/workstation/templates/.config/vlc/vlcrc (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/workstation/templates/.xsession (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/workstation/templates/bin_wrapper.sh.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/workstation/templates/desktop_app.j2 (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/workstation/templates/system/xorg.conf (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/workstation/tests/inventory (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/roles/workstation/vars/main.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/tests/config.yml (100%) rename {collections/ansible_collections => ansible_collections}/nullified/infrastructure/tests/sanity/ignore-2.15.txt (100%) delete mode 100644 collections/ansible_collections/nullified/infrastructure/extensions/ansible.cfg diff --git a/.gitignore b/.gitignore index c19b82b..7cd790b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,14 +2,14 @@ .idea .*~ .*# +.webui_secret_key # ansible ansible.cfg -collections/ansible_collections/* -collections/ansible_collections/*/*/logs/* -collections/ansible_collections/*/*/tests/* -!collections/ansible_collections/*/*/tests/config.yml -!collections/ansible_collections/*/*/tests/sanity -!collections/ansible_collections/nullified +ansible_collections/*/*/logs/* +ansible_collections/*/*/tests/* +!ansible_collections/*/*/tests/config.yml +!ansible_collections/*/*/tests/sanity +galaxy galaxy_cache galaxy_token inventory/inventory.yml diff --git a/collections/ansible_collections/nullified/infrastructure/README.md b/ansible_collections/nullified/infrastructure/README.md similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/README.md rename to ansible_collections/nullified/infrastructure/README.md diff --git a/collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/converge.yml b/ansible_collections/nullified/infrastructure/extensions/molecule/default/converge.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/converge.yml rename to ansible_collections/nullified/infrastructure/extensions/molecule/default/converge.yml diff --git a/collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/create.yml b/ansible_collections/nullified/infrastructure/extensions/molecule/default/create.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/create.yml rename to ansible_collections/nullified/infrastructure/extensions/molecule/default/create.yml diff --git a/collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/destroy.yml b/ansible_collections/nullified/infrastructure/extensions/molecule/default/destroy.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/destroy.yml rename to ansible_collections/nullified/infrastructure/extensions/molecule/default/destroy.yml diff --git a/collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/molecule.yml b/ansible_collections/nullified/infrastructure/extensions/molecule/default/molecule.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/molecule.yml rename to ansible_collections/nullified/infrastructure/extensions/molecule/default/molecule.yml diff --git a/collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/platform_vars.yml b/ansible_collections/nullified/infrastructure/extensions/molecule/default/platform_vars.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/platform_vars.yml rename to ansible_collections/nullified/infrastructure/extensions/molecule/default/platform_vars.yml diff --git a/collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/requirements.yml b/ansible_collections/nullified/infrastructure/extensions/molecule/default/requirements.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/requirements.yml rename to ansible_collections/nullified/infrastructure/extensions/molecule/default/requirements.yml diff --git a/collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/tasks/create-fail.yml b/ansible_collections/nullified/infrastructure/extensions/molecule/default/tasks/create-fail.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/extensions/molecule/default/tasks/create-fail.yml rename to ansible_collections/nullified/infrastructure/extensions/molecule/default/tasks/create-fail.yml diff --git a/collections/ansible_collections/nullified/infrastructure/galaxy.yml b/ansible_collections/nullified/infrastructure/galaxy.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/galaxy.yml rename to ansible_collections/nullified/infrastructure/galaxy.yml diff --git a/collections/ansible_collections/nullified/infrastructure/logs/.gitkeep b/ansible_collections/nullified/infrastructure/logs/.gitkeep similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/logs/.gitkeep rename to ansible_collections/nullified/infrastructure/logs/.gitkeep diff --git a/collections/ansible_collections/nullified/infrastructure/meta/runtime.yml b/ansible_collections/nullified/infrastructure/meta/runtime.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/meta/runtime.yml rename to ansible_collections/nullified/infrastructure/meta/runtime.yml diff --git a/collections/ansible_collections/nullified/infrastructure/plugins/README.md b/ansible_collections/nullified/infrastructure/plugins/README.md similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/plugins/README.md rename to ansible_collections/nullified/infrastructure/plugins/README.md diff --git a/collections/ansible_collections/nullified/infrastructure/plugins/modules/github_artifact.py b/ansible_collections/nullified/infrastructure/plugins/modules/github_artifact.py similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/plugins/modules/github_artifact.py rename to ansible_collections/nullified/infrastructure/plugins/modules/github_artifact.py diff --git a/collections/ansible_collections/nullified/infrastructure/plugins/tests/github_artifact.json b/ansible_collections/nullified/infrastructure/plugins/tests/github_artifact.json similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/plugins/tests/github_artifact.json rename to ansible_collections/nullified/infrastructure/plugins/tests/github_artifact.json diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-Bold.ttf b/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-Bold.ttf similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-Bold.ttf rename to ansible_collections/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-Bold.ttf diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-BoldItalic.ttf b/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-BoldItalic.ttf similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-BoldItalic.ttf rename to ansible_collections/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-BoldItalic.ttf diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-Italic.ttf b/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-Italic.ttf similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-Italic.ttf rename to ansible_collections/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-Italic.ttf diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-Regular.ttf b/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-Regular.ttf similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-Regular.ttf rename to ansible_collections/nullified/infrastructure/roles/common/assets/fonts/JetBrainsMonoNerdFontMono-Regular.ttf diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Bold Italic.ttf b/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Bold Italic.ttf similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Bold Italic.ttf rename to ansible_collections/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Bold Italic.ttf diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Bold.ttf b/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Bold.ttf similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Bold.ttf rename to ansible_collections/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Bold.ttf diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Italic.ttf b/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Italic.ttf similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Italic.ttf rename to ansible_collections/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Italic.ttf diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Regular.ttf b/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Regular.ttf similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Regular.ttf rename to ansible_collections/nullified/infrastructure/roles/common/assets/fonts/Meslo LG S NF Mono Regular.ttf diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/defaults/main.yml b/ansible_collections/nullified/infrastructure/roles/common/defaults/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/defaults/main.yml rename to ansible_collections/nullified/infrastructure/roles/common/defaults/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/handlers/main.yml b/ansible_collections/nullified/infrastructure/roles/common/handlers/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/handlers/main.yml rename to ansible_collections/nullified/infrastructure/roles/common/handlers/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/meta/main.yml b/ansible_collections/nullified/infrastructure/roles/common/meta/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/meta/main.yml rename to ansible_collections/nullified/infrastructure/roles/common/meta/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/tasks/home_setup.yml b/ansible_collections/nullified/infrastructure/roles/common/tasks/home_setup.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/tasks/home_setup.yml rename to ansible_collections/nullified/infrastructure/roles/common/tasks/home_setup.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/tasks/main.yml b/ansible_collections/nullified/infrastructure/roles/common/tasks/main.yml similarity index 98% rename from collections/ansible_collections/nullified/infrastructure/roles/common/tasks/main.yml rename to ansible_collections/nullified/infrastructure/roles/common/tasks/main.yml index 23989f5..29e2827 100644 --- a/collections/ansible_collections/nullified/infrastructure/roles/common/tasks/main.yml +++ b/ansible_collections/nullified/infrastructure/roles/common/tasks/main.yml @@ -52,7 +52,6 @@ - smartmontools - tree - xz-utils - - yq state: present - name: 'install firmware management tools' @@ -112,6 +111,8 @@ creates: /usr/bin/duf cmds: - dpkg -i {asset_dirname}/{asset_filename} + - repository: mikefarah/yq + asset_name: - name: '[apt] install custom packages' become: true diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/tasks/shell_customization.yml b/ansible_collections/nullified/infrastructure/roles/common/tasks/shell_customization.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/tasks/shell_customization.yml rename to ansible_collections/nullified/infrastructure/roles/common/tasks/shell_customization.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/templates/home/.gitconfig.j2 b/ansible_collections/nullified/infrastructure/roles/common/templates/home/.gitconfig.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/templates/home/.gitconfig.j2 rename to ansible_collections/nullified/infrastructure/roles/common/templates/home/.gitconfig.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/templates/home/.lessfilter b/ansible_collections/nullified/infrastructure/roles/common/templates/home/.lessfilter similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/templates/home/.lessfilter rename to ansible_collections/nullified/infrastructure/roles/common/templates/home/.lessfilter diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/templates/home/.p10k.zsh b/ansible_collections/nullified/infrastructure/roles/common/templates/home/.p10k.zsh similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/templates/home/.p10k.zsh rename to ansible_collections/nullified/infrastructure/roles/common/templates/home/.p10k.zsh diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/templates/home/.pythonrc b/ansible_collections/nullified/infrastructure/roles/common/templates/home/.pythonrc similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/templates/home/.pythonrc rename to ansible_collections/nullified/infrastructure/roles/common/templates/home/.pythonrc diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/templates/home/.zsh_aliases b/ansible_collections/nullified/infrastructure/roles/common/templates/home/.zsh_aliases similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/templates/home/.zsh_aliases rename to ansible_collections/nullified/infrastructure/roles/common/templates/home/.zsh_aliases diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/templates/home/.zsh_completions b/ansible_collections/nullified/infrastructure/roles/common/templates/home/.zsh_completions similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/templates/home/.zsh_completions rename to ansible_collections/nullified/infrastructure/roles/common/templates/home/.zsh_completions diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/templates/home/.zsh_exports b/ansible_collections/nullified/infrastructure/roles/common/templates/home/.zsh_exports similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/templates/home/.zsh_exports rename to ansible_collections/nullified/infrastructure/roles/common/templates/home/.zsh_exports diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/templates/home/.zsh_functions b/ansible_collections/nullified/infrastructure/roles/common/templates/home/.zsh_functions similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/templates/home/.zsh_functions rename to ansible_collections/nullified/infrastructure/roles/common/templates/home/.zsh_functions diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/templates/home/.zshrc b/ansible_collections/nullified/infrastructure/roles/common/templates/home/.zshrc similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/templates/home/.zshrc rename to ansible_collections/nullified/infrastructure/roles/common/templates/home/.zshrc diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/tests/inventory b/ansible_collections/nullified/infrastructure/roles/common/tests/inventory similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/tests/inventory rename to ansible_collections/nullified/infrastructure/roles/common/tests/inventory diff --git a/collections/ansible_collections/nullified/infrastructure/roles/common/vars/main.yml b/ansible_collections/nullified/infrastructure/roles/common/vars/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/common/vars/main.yml rename to ansible_collections/nullified/infrastructure/roles/common/vars/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/development/defaults/main.yml b/ansible_collections/nullified/infrastructure/roles/development/defaults/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/development/defaults/main.yml rename to ansible_collections/nullified/infrastructure/roles/development/defaults/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/development/handlers/main.yml b/ansible_collections/nullified/infrastructure/roles/development/handlers/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/development/handlers/main.yml rename to ansible_collections/nullified/infrastructure/roles/development/handlers/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/development/meta/main.yml b/ansible_collections/nullified/infrastructure/roles/development/meta/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/development/meta/main.yml rename to ansible_collections/nullified/infrastructure/roles/development/meta/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/development/tasks/main.yml b/ansible_collections/nullified/infrastructure/roles/development/tasks/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/development/tasks/main.yml rename to ansible_collections/nullified/infrastructure/roles/development/tasks/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/development/templates/docker-ce/daemon.json.j2 b/ansible_collections/nullified/infrastructure/roles/development/templates/docker-ce/daemon.json.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/development/templates/docker-ce/daemon.json.j2 rename to ansible_collections/nullified/infrastructure/roles/development/templates/docker-ce/daemon.json.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/development/tests/inventory b/ansible_collections/nullified/infrastructure/roles/development/tests/inventory similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/development/tests/inventory rename to ansible_collections/nullified/infrastructure/roles/development/tests/inventory diff --git a/collections/ansible_collections/nullified/infrastructure/roles/development/vars/main.yml b/ansible_collections/nullified/infrastructure/roles/development/vars/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/development/vars/main.yml rename to ansible_collections/nullified/infrastructure/roles/development/vars/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/gaming/defaults/main.yml b/ansible_collections/nullified/infrastructure/roles/gaming/defaults/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/gaming/defaults/main.yml rename to ansible_collections/nullified/infrastructure/roles/gaming/defaults/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/gaming/handlers/main.yml b/ansible_collections/nullified/infrastructure/roles/gaming/handlers/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/gaming/handlers/main.yml rename to ansible_collections/nullified/infrastructure/roles/gaming/handlers/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/gaming/meta/main.yml b/ansible_collections/nullified/infrastructure/roles/gaming/meta/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/gaming/meta/main.yml rename to ansible_collections/nullified/infrastructure/roles/gaming/meta/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/gaming/tasks/main.yml b/ansible_collections/nullified/infrastructure/roles/gaming/tasks/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/gaming/tasks/main.yml rename to ansible_collections/nullified/infrastructure/roles/gaming/tasks/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/gaming/tests/inventory b/ansible_collections/nullified/infrastructure/roles/gaming/tests/inventory similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/gaming/tests/inventory rename to ansible_collections/nullified/infrastructure/roles/gaming/tests/inventory diff --git a/collections/ansible_collections/nullified/infrastructure/roles/gaming/vars/main.yml b/ansible_collections/nullified/infrastructure/roles/gaming/vars/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/gaming/vars/main.yml rename to ansible_collections/nullified/infrastructure/roles/gaming/vars/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/helm/README.md b/ansible_collections/nullified/infrastructure/roles/helm/README.md similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/helm/README.md rename to ansible_collections/nullified/infrastructure/roles/helm/README.md diff --git a/collections/ansible_collections/nullified/infrastructure/roles/helm/defaults/main.yml b/ansible_collections/nullified/infrastructure/roles/helm/defaults/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/helm/defaults/main.yml rename to ansible_collections/nullified/infrastructure/roles/helm/defaults/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/helm/handlers/main.yml b/ansible_collections/nullified/infrastructure/roles/helm/handlers/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/helm/handlers/main.yml rename to ansible_collections/nullified/infrastructure/roles/helm/handlers/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/helm/meta/main.yml b/ansible_collections/nullified/infrastructure/roles/helm/meta/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/helm/meta/main.yml rename to ansible_collections/nullified/infrastructure/roles/helm/meta/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/helm/tasks/main.yml b/ansible_collections/nullified/infrastructure/roles/helm/tasks/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/helm/tasks/main.yml rename to ansible_collections/nullified/infrastructure/roles/helm/tasks/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/helm/tests/inventory b/ansible_collections/nullified/infrastructure/roles/helm/tests/inventory similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/helm/tests/inventory rename to ansible_collections/nullified/infrastructure/roles/helm/tests/inventory diff --git a/collections/ansible_collections/nullified/infrastructure/roles/helm/tests/test.yml b/ansible_collections/nullified/infrastructure/roles/helm/tests/test.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/helm/tests/test.yml rename to ansible_collections/nullified/infrastructure/roles/helm/tests/test.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/helm/vars/main.yml b/ansible_collections/nullified/infrastructure/roles/helm/vars/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/helm/vars/main.yml rename to ansible_collections/nullified/infrastructure/roles/helm/vars/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/k3s/defaults/main.yml b/ansible_collections/nullified/infrastructure/roles/k3s/defaults/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/k3s/defaults/main.yml rename to ansible_collections/nullified/infrastructure/roles/k3s/defaults/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/k3s/handlers/main.yml b/ansible_collections/nullified/infrastructure/roles/k3s/handlers/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/k3s/handlers/main.yml rename to ansible_collections/nullified/infrastructure/roles/k3s/handlers/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/k3s/meta/main.yml b/ansible_collections/nullified/infrastructure/roles/k3s/meta/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/k3s/meta/main.yml rename to ansible_collections/nullified/infrastructure/roles/k3s/meta/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/k3s/tasks/agent.yml b/ansible_collections/nullified/infrastructure/roles/k3s/tasks/agent.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/k3s/tasks/agent.yml rename to ansible_collections/nullified/infrastructure/roles/k3s/tasks/agent.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/k3s/tasks/main.yml b/ansible_collections/nullified/infrastructure/roles/k3s/tasks/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/k3s/tasks/main.yml rename to ansible_collections/nullified/infrastructure/roles/k3s/tasks/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/k3s/tasks/opentofu.yml b/ansible_collections/nullified/infrastructure/roles/k3s/tasks/opentofu.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/k3s/tasks/opentofu.yml rename to ansible_collections/nullified/infrastructure/roles/k3s/tasks/opentofu.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/k3s/tasks/server.yml b/ansible_collections/nullified/infrastructure/roles/k3s/tasks/server.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/k3s/tasks/server.yml rename to ansible_collections/nullified/infrastructure/roles/k3s/tasks/server.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/k3s/templates/nftables.d/k3s_agents.nft.j2 b/ansible_collections/nullified/infrastructure/roles/k3s/templates/nftables.d/k3s_agents.nft.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/k3s/templates/nftables.d/k3s_agents.nft.j2 rename to ansible_collections/nullified/infrastructure/roles/k3s/templates/nftables.d/k3s_agents.nft.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/k3s/templates/nftables.d/k3s_servers.nft.j2 b/ansible_collections/nullified/infrastructure/roles/k3s/templates/nftables.d/k3s_servers.nft.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/k3s/templates/nftables.d/k3s_servers.nft.j2 rename to ansible_collections/nullified/infrastructure/roles/k3s/templates/nftables.d/k3s_servers.nft.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/k3s/tests/inventory b/ansible_collections/nullified/infrastructure/roles/k3s/tests/inventory similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/k3s/tests/inventory rename to ansible_collections/nullified/infrastructure/roles/k3s/tests/inventory diff --git a/collections/ansible_collections/nullified/infrastructure/roles/k3s/vars/main.yml b/ansible_collections/nullified/infrastructure/roles/k3s/vars/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/k3s/vars/main.yml rename to ansible_collections/nullified/infrastructure/roles/k3s/vars/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/kubectl/README.md b/ansible_collections/nullified/infrastructure/roles/kubectl/README.md similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/kubectl/README.md rename to ansible_collections/nullified/infrastructure/roles/kubectl/README.md diff --git a/collections/ansible_collections/nullified/infrastructure/roles/kubectl/defaults/main.yml b/ansible_collections/nullified/infrastructure/roles/kubectl/defaults/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/kubectl/defaults/main.yml rename to ansible_collections/nullified/infrastructure/roles/kubectl/defaults/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/kubectl/handlers/main.yml b/ansible_collections/nullified/infrastructure/roles/kubectl/handlers/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/kubectl/handlers/main.yml rename to ansible_collections/nullified/infrastructure/roles/kubectl/handlers/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/kubectl/meta/main.yml b/ansible_collections/nullified/infrastructure/roles/kubectl/meta/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/kubectl/meta/main.yml rename to ansible_collections/nullified/infrastructure/roles/kubectl/meta/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/kubectl/tasks/main.yml b/ansible_collections/nullified/infrastructure/roles/kubectl/tasks/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/kubectl/tasks/main.yml rename to ansible_collections/nullified/infrastructure/roles/kubectl/tasks/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/kubectl/tests/inventory b/ansible_collections/nullified/infrastructure/roles/kubectl/tests/inventory similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/kubectl/tests/inventory rename to ansible_collections/nullified/infrastructure/roles/kubectl/tests/inventory diff --git a/collections/ansible_collections/nullified/infrastructure/roles/kubectl/tests/test.yml b/ansible_collections/nullified/infrastructure/roles/kubectl/tests/test.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/kubectl/tests/test.yml rename to ansible_collections/nullified/infrastructure/roles/kubectl/tests/test.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/kubectl/vars/main.yml b/ansible_collections/nullified/infrastructure/roles/kubectl/vars/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/kubectl/vars/main.yml rename to ansible_collections/nullified/infrastructure/roles/kubectl/vars/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/mariadb/defaults/main.yml b/ansible_collections/nullified/infrastructure/roles/mariadb/defaults/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/mariadb/defaults/main.yml rename to ansible_collections/nullified/infrastructure/roles/mariadb/defaults/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/mariadb/handlers/main.yml b/ansible_collections/nullified/infrastructure/roles/mariadb/handlers/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/mariadb/handlers/main.yml rename to ansible_collections/nullified/infrastructure/roles/mariadb/handlers/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/mariadb/meta/main.yml b/ansible_collections/nullified/infrastructure/roles/mariadb/meta/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/mariadb/meta/main.yml rename to ansible_collections/nullified/infrastructure/roles/mariadb/meta/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/mariadb/tasks/client.yml b/ansible_collections/nullified/infrastructure/roles/mariadb/tasks/client.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/mariadb/tasks/client.yml rename to ansible_collections/nullified/infrastructure/roles/mariadb/tasks/client.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/mariadb/tasks/main.yml b/ansible_collections/nullified/infrastructure/roles/mariadb/tasks/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/mariadb/tasks/main.yml rename to ansible_collections/nullified/infrastructure/roles/mariadb/tasks/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/mariadb/tasks/server.yml b/ansible_collections/nullified/infrastructure/roles/mariadb/tasks/server.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/mariadb/tasks/server.yml rename to ansible_collections/nullified/infrastructure/roles/mariadb/tasks/server.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/mariadb/templates/mariadb_init.sql.j2 b/ansible_collections/nullified/infrastructure/roles/mariadb/templates/mariadb_init.sql.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/mariadb/templates/mariadb_init.sql.j2 rename to ansible_collections/nullified/infrastructure/roles/mariadb/templates/mariadb_init.sql.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/mariadb/templates/nftables.d/mariadb.nft.j2 b/ansible_collections/nullified/infrastructure/roles/mariadb/templates/nftables.d/mariadb.nft.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/mariadb/templates/nftables.d/mariadb.nft.j2 rename to ansible_collections/nullified/infrastructure/roles/mariadb/templates/nftables.d/mariadb.nft.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/mariadb/tests/inventory b/ansible_collections/nullified/infrastructure/roles/mariadb/tests/inventory similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/mariadb/tests/inventory rename to ansible_collections/nullified/infrastructure/roles/mariadb/tests/inventory diff --git a/collections/ansible_collections/nullified/infrastructure/roles/mariadb/vars/main.yml b/ansible_collections/nullified/infrastructure/roles/mariadb/vars/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/mariadb/vars/main.yml rename to ansible_collections/nullified/infrastructure/roles/mariadb/vars/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/nginx/defaults/main.yml b/ansible_collections/nullified/infrastructure/roles/nginx/defaults/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/nginx/defaults/main.yml rename to ansible_collections/nullified/infrastructure/roles/nginx/defaults/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/nginx/handlers/main.yml b/ansible_collections/nullified/infrastructure/roles/nginx/handlers/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/nginx/handlers/main.yml rename to ansible_collections/nullified/infrastructure/roles/nginx/handlers/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/nginx/meta/main.yml b/ansible_collections/nullified/infrastructure/roles/nginx/meta/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/nginx/meta/main.yml rename to ansible_collections/nullified/infrastructure/roles/nginx/meta/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/nginx/tasks/main.yml b/ansible_collections/nullified/infrastructure/roles/nginx/tasks/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/nginx/tasks/main.yml rename to ansible_collections/nullified/infrastructure/roles/nginx/tasks/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/nginx/tasks/nginx-config.yml b/ansible_collections/nullified/infrastructure/roles/nginx/tasks/nginx-config.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/nginx/tasks/nginx-config.yml rename to ansible_collections/nullified/infrastructure/roles/nginx/tasks/nginx-config.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/nginx/tasks/nginx-service-entry.yml b/ansible_collections/nullified/infrastructure/roles/nginx/tasks/nginx-service-entry.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/nginx/tasks/nginx-service-entry.yml rename to ansible_collections/nullified/infrastructure/roles/nginx/tasks/nginx-service-entry.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/nginx/templates/ingress_http_nginx.nft.j2 b/ansible_collections/nullified/infrastructure/roles/nginx/templates/ingress_http_nginx.nft.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/nginx/templates/ingress_http_nginx.nft.j2 rename to ansible_collections/nullified/infrastructure/roles/nginx/templates/ingress_http_nginx.nft.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/nginx/templates/nginx.conf.j2 b/ansible_collections/nullified/infrastructure/roles/nginx/templates/nginx.conf.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/nginx/templates/nginx.conf.j2 rename to ansible_collections/nullified/infrastructure/roles/nginx/templates/nginx.conf.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/nginx/templates/nginx_limits.conf.j2 b/ansible_collections/nullified/infrastructure/roles/nginx/templates/nginx_limits.conf.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/nginx/templates/nginx_limits.conf.j2 rename to ansible_collections/nullified/infrastructure/roles/nginx/templates/nginx_limits.conf.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/nginx/tests/inventory b/ansible_collections/nullified/infrastructure/roles/nginx/tests/inventory similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/nginx/tests/inventory rename to ansible_collections/nullified/infrastructure/roles/nginx/tests/inventory diff --git a/collections/ansible_collections/nullified/infrastructure/roles/nginx/tests/test.yml b/ansible_collections/nullified/infrastructure/roles/nginx/tests/test.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/nginx/tests/test.yml rename to ansible_collections/nullified/infrastructure/roles/nginx/tests/test.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/nginx/vars/main.yml b/ansible_collections/nullified/infrastructure/roles/nginx/vars/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/nginx/vars/main.yml rename to ansible_collections/nullified/infrastructure/roles/nginx/vars/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/postgresql/defaults/main.yml b/ansible_collections/nullified/infrastructure/roles/postgresql/defaults/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/postgresql/defaults/main.yml rename to ansible_collections/nullified/infrastructure/roles/postgresql/defaults/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/postgresql/handlers/main.yml b/ansible_collections/nullified/infrastructure/roles/postgresql/handlers/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/postgresql/handlers/main.yml rename to ansible_collections/nullified/infrastructure/roles/postgresql/handlers/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/postgresql/meta/main.yml b/ansible_collections/nullified/infrastructure/roles/postgresql/meta/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/postgresql/meta/main.yml rename to ansible_collections/nullified/infrastructure/roles/postgresql/meta/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/postgresql/tasks/client.yml b/ansible_collections/nullified/infrastructure/roles/postgresql/tasks/client.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/postgresql/tasks/client.yml rename to ansible_collections/nullified/infrastructure/roles/postgresql/tasks/client.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/postgresql/tasks/main.yml b/ansible_collections/nullified/infrastructure/roles/postgresql/tasks/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/postgresql/tasks/main.yml rename to ansible_collections/nullified/infrastructure/roles/postgresql/tasks/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/postgresql/tasks/server.yml b/ansible_collections/nullified/infrastructure/roles/postgresql/tasks/server.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/postgresql/tasks/server.yml rename to ansible_collections/nullified/infrastructure/roles/postgresql/tasks/server.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/postgresql/templates/nftables.d/postgresql.nft.j2 b/ansible_collections/nullified/infrastructure/roles/postgresql/templates/nftables.d/postgresql.nft.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/postgresql/templates/nftables.d/postgresql.nft.j2 rename to ansible_collections/nullified/infrastructure/roles/postgresql/templates/nftables.d/postgresql.nft.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/postgresql/templates/postgresql_init.sql.j2 b/ansible_collections/nullified/infrastructure/roles/postgresql/templates/postgresql_init.sql.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/postgresql/templates/postgresql_init.sql.j2 rename to ansible_collections/nullified/infrastructure/roles/postgresql/templates/postgresql_init.sql.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/postgresql/tests/inventory b/ansible_collections/nullified/infrastructure/roles/postgresql/tests/inventory similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/postgresql/tests/inventory rename to ansible_collections/nullified/infrastructure/roles/postgresql/tests/inventory diff --git a/collections/ansible_collections/nullified/infrastructure/roles/postgresql/tests/test.yml b/ansible_collections/nullified/infrastructure/roles/postgresql/tests/test.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/postgresql/tests/test.yml rename to ansible_collections/nullified/infrastructure/roles/postgresql/tests/test.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/postgresql/vars/main.yml b/ansible_collections/nullified/infrastructure/roles/postgresql/vars/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/postgresql/vars/main.yml rename to ansible_collections/nullified/infrastructure/roles/postgresql/vars/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/provisioner/defaults/main.yml b/ansible_collections/nullified/infrastructure/roles/provisioner/defaults/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/provisioner/defaults/main.yml rename to ansible_collections/nullified/infrastructure/roles/provisioner/defaults/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/provisioner/handlers/main.yml b/ansible_collections/nullified/infrastructure/roles/provisioner/handlers/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/provisioner/handlers/main.yml rename to ansible_collections/nullified/infrastructure/roles/provisioner/handlers/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/provisioner/meta/main.yml b/ansible_collections/nullified/infrastructure/roles/provisioner/meta/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/provisioner/meta/main.yml rename to ansible_collections/nullified/infrastructure/roles/provisioner/meta/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/provisioner/tasks/load_facts.yml b/ansible_collections/nullified/infrastructure/roles/provisioner/tasks/load_facts.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/provisioner/tasks/load_facts.yml rename to ansible_collections/nullified/infrastructure/roles/provisioner/tasks/load_facts.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/provisioner/tasks/main.yml b/ansible_collections/nullified/infrastructure/roles/provisioner/tasks/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/provisioner/tasks/main.yml rename to ansible_collections/nullified/infrastructure/roles/provisioner/tasks/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/provisioner/tests/inventory b/ansible_collections/nullified/infrastructure/roles/provisioner/tests/inventory similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/provisioner/tests/inventory rename to ansible_collections/nullified/infrastructure/roles/provisioner/tests/inventory diff --git a/collections/ansible_collections/nullified/infrastructure/roles/provisioner/vars/main.yml b/ansible_collections/nullified/infrastructure/roles/provisioner/vars/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/provisioner/vars/main.yml rename to ansible_collections/nullified/infrastructure/roles/provisioner/vars/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/defaults/main.yml b/ansible_collections/nullified/infrastructure/roles/security/defaults/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/defaults/main.yml rename to ansible_collections/nullified/infrastructure/roles/security/defaults/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/handlers/main.yml b/ansible_collections/nullified/infrastructure/roles/security/handlers/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/handlers/main.yml rename to ansible_collections/nullified/infrastructure/roles/security/handlers/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/meta/main.yml b/ansible_collections/nullified/infrastructure/roles/security/meta/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/meta/main.yml rename to ansible_collections/nullified/infrastructure/roles/security/meta/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/tasks/firewall.yml b/ansible_collections/nullified/infrastructure/roles/security/tasks/firewall.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/tasks/firewall.yml rename to ansible_collections/nullified/infrastructure/roles/security/tasks/firewall.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/tasks/main.yml b/ansible_collections/nullified/infrastructure/roles/security/tasks/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/tasks/main.yml rename to ansible_collections/nullified/infrastructure/roles/security/tasks/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/clamav/clamav-clamd.service.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/clamav/clamav-clamd.service.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/clamav/clamav-clamd.service.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/clamav/clamav-clamd.service.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/clamav/clamav-freshclam.service.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/clamav/clamav-freshclam.service.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/clamav/clamav-freshclam.service.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/clamav/clamav-freshclam.service.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/clamav/clamav-milter.conf.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/clamav/clamav-milter.conf.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/clamav/clamav-milter.conf.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/clamav/clamav-milter.conf.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/clamav/clamd.conf.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/clamav/clamd.conf.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/clamav/clamd.conf.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/clamav/clamd.conf.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/clamav/freshclam.conf.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/clamav/freshclam.conf.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/clamav/freshclam.conf.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/clamav/freshclam.conf.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/openssh-server/sshd_config.d/encryption.conf.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/openssh-server/sshd_config.d/encryption.conf.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/openssh-server/sshd_config.d/encryption.conf.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/openssh-server/sshd_config.d/encryption.conf.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/openssh-server/sshd_config.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/openssh-server/sshd_config.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/openssh-server/sshd_config.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/openssh-server/sshd_config.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/rkhunter/rkhunter.conf.local.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/rkhunter/rkhunter.conf.local.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/rkhunter/rkhunter.conf.local.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/rkhunter/rkhunter.conf.local.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/limits.conf.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/limits.conf.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/limits.conf.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/limits.conf.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/login.defs.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/login.defs.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/login.defs.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/login.defs.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/nftables.conf.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/nftables.conf.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/nftables.conf.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/nftables.conf.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/resolv.conf.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/resolv.conf.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/resolv.conf.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/resolv.conf.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/sysctld.local.conf.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/sysctld.local.conf.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/sysctld.local.conf.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/system/debian/sysctld.local.conf.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables.d/egress_http.nft.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables.d/egress_http.nft.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables.d/egress_http.nft.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables.d/egress_http.nft.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables.d/egress_icmp.nft.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables.d/egress_icmp.nft.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables.d/egress_icmp.nft.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables.d/egress_icmp.nft.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables.d/ingress_icmp.nft.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables.d/ingress_icmp.nft.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables.d/ingress_icmp.nft.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables.d/ingress_icmp.nft.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables/01-nat.table.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables/01-nat.table.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables/01-nat.table.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables/01-nat.table.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables/02-mangle.table.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables/02-mangle.table.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables/02-mangle.table.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables/02-mangle.table.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables/03-filter.table.j2 b/ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables/03-filter.table.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables/03-filter.table.j2 rename to ansible_collections/nullified/infrastructure/roles/security/templates/system/nftables/03-filter.table.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/tests/inventory b/ansible_collections/nullified/infrastructure/roles/security/tests/inventory similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/tests/inventory rename to ansible_collections/nullified/infrastructure/roles/security/tests/inventory diff --git a/collections/ansible_collections/nullified/infrastructure/roles/security/vars/main.yml b/ansible_collections/nullified/infrastructure/roles/security/vars/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/security/vars/main.yml rename to ansible_collections/nullified/infrastructure/roles/security/vars/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/server/defaults/main.yml b/ansible_collections/nullified/infrastructure/roles/server/defaults/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/server/defaults/main.yml rename to ansible_collections/nullified/infrastructure/roles/server/defaults/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/server/handlers/main.yml b/ansible_collections/nullified/infrastructure/roles/server/handlers/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/server/handlers/main.yml rename to ansible_collections/nullified/infrastructure/roles/server/handlers/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/server/meta/main.yml b/ansible_collections/nullified/infrastructure/roles/server/meta/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/server/meta/main.yml rename to ansible_collections/nullified/infrastructure/roles/server/meta/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/server/tasks/main.yml b/ansible_collections/nullified/infrastructure/roles/server/tasks/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/server/tasks/main.yml rename to ansible_collections/nullified/infrastructure/roles/server/tasks/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/server/tests/inventory b/ansible_collections/nullified/infrastructure/roles/server/tests/inventory similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/server/tests/inventory rename to ansible_collections/nullified/infrastructure/roles/server/tests/inventory diff --git a/collections/ansible_collections/nullified/infrastructure/roles/server/vars/main.yml b/ansible_collections/nullified/infrastructure/roles/server/vars/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/server/vars/main.yml rename to ansible_collections/nullified/infrastructure/roles/server/vars/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/vault/defaults/main.yml b/ansible_collections/nullified/infrastructure/roles/vault/defaults/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/vault/defaults/main.yml rename to ansible_collections/nullified/infrastructure/roles/vault/defaults/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/vault/handlers/main.yml b/ansible_collections/nullified/infrastructure/roles/vault/handlers/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/vault/handlers/main.yml rename to ansible_collections/nullified/infrastructure/roles/vault/handlers/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/vault/meta/main.yml b/ansible_collections/nullified/infrastructure/roles/vault/meta/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/vault/meta/main.yml rename to ansible_collections/nullified/infrastructure/roles/vault/meta/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/vault/tasks/initialize.yml b/ansible_collections/nullified/infrastructure/roles/vault/tasks/initialize.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/vault/tasks/initialize.yml rename to ansible_collections/nullified/infrastructure/roles/vault/tasks/initialize.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/vault/tasks/install_binary.yml b/ansible_collections/nullified/infrastructure/roles/vault/tasks/install_binary.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/vault/tasks/install_binary.yml rename to ansible_collections/nullified/infrastructure/roles/vault/tasks/install_binary.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/vault/tasks/install_service.yml b/ansible_collections/nullified/infrastructure/roles/vault/tasks/install_service.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/vault/tasks/install_service.yml rename to ansible_collections/nullified/infrastructure/roles/vault/tasks/install_service.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/vault/tasks/main.yml b/ansible_collections/nullified/infrastructure/roles/vault/tasks/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/vault/tasks/main.yml rename to ansible_collections/nullified/infrastructure/roles/vault/tasks/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/vault/tasks/prerequisites.yml b/ansible_collections/nullified/infrastructure/roles/vault/tasks/prerequisites.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/vault/tasks/prerequisites.yml rename to ansible_collections/nullified/infrastructure/roles/vault/tasks/prerequisites.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/vault/tasks/security.yml b/ansible_collections/nullified/infrastructure/roles/vault/tasks/security.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/vault/tasks/security.yml rename to ansible_collections/nullified/infrastructure/roles/vault/tasks/security.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/vault/templates/config.hcl.j2 b/ansible_collections/nullified/infrastructure/roles/vault/templates/config.hcl.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/vault/templates/config.hcl.j2 rename to ansible_collections/nullified/infrastructure/roles/vault/templates/config.hcl.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/vault/templates/env.j2 b/ansible_collections/nullified/infrastructure/roles/vault/templates/env.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/vault/templates/env.j2 rename to ansible_collections/nullified/infrastructure/roles/vault/templates/env.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/vault/templates/vault-unit.service.j2 b/ansible_collections/nullified/infrastructure/roles/vault/templates/vault-unit.service.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/vault/templates/vault-unit.service.j2 rename to ansible_collections/nullified/infrastructure/roles/vault/templates/vault-unit.service.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/vault/templates/vault.nft.j2 b/ansible_collections/nullified/infrastructure/roles/vault/templates/vault.nft.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/vault/templates/vault.nft.j2 rename to ansible_collections/nullified/infrastructure/roles/vault/templates/vault.nft.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/vault/tests/inventory b/ansible_collections/nullified/infrastructure/roles/vault/tests/inventory similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/vault/tests/inventory rename to ansible_collections/nullified/infrastructure/roles/vault/tests/inventory diff --git a/collections/ansible_collections/nullified/infrastructure/roles/vault/vars/main.yml b/ansible_collections/nullified/infrastructure/roles/vault/vars/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/vault/vars/main.yml rename to ansible_collections/nullified/infrastructure/roles/vault/vars/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/defaults/main.yml b/ansible_collections/nullified/infrastructure/roles/workstation/defaults/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/workstation/defaults/main.yml rename to ansible_collections/nullified/infrastructure/roles/workstation/defaults/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/handlers/main.yml b/ansible_collections/nullified/infrastructure/roles/workstation/handlers/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/workstation/handlers/main.yml rename to ansible_collections/nullified/infrastructure/roles/workstation/handlers/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/meta/main.yml b/ansible_collections/nullified/infrastructure/roles/workstation/meta/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/workstation/meta/main.yml rename to ansible_collections/nullified/infrastructure/roles/workstation/meta/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/tasks/main.yml b/ansible_collections/nullified/infrastructure/roles/workstation/tasks/main.yml similarity index 98% rename from collections/ansible_collections/nullified/infrastructure/roles/workstation/tasks/main.yml rename to ansible_collections/nullified/infrastructure/roles/workstation/tasks/main.yml index ab2528e..6830f3b 100644 --- a/collections/ansible_collections/nullified/infrastructure/roles/workstation/tasks/main.yml +++ b/ansible_collections/nullified/infrastructure/roles/workstation/tasks/main.yml @@ -143,9 +143,9 @@ group: "{{ item.group | default(workstation_user_account) }}" state: directory loop: - - { path: '/opt/git/foss' } - - { path: '/opt/git/perso' } - - { path: '/opt/git/work' } + - { path: '/srv/git/foss' } + - { path: '/srv/git/perso' } + - { path: '/srv/git/work' } - { path: '/srv/storage' } - name: '[emacs] fetch emacs configuration files' diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/tasks/window_manager.yml b/ansible_collections/nullified/infrastructure/roles/workstation/tasks/window_manager.yml similarity index 92% rename from collections/ansible_collections/nullified/infrastructure/roles/workstation/tasks/window_manager.yml rename to ansible_collections/nullified/infrastructure/roles/workstation/tasks/window_manager.yml index 135e5f7..d07f5cb 100644 --- a/collections/ansible_collections/nullified/infrastructure/roles/workstation/tasks/window_manager.yml +++ b/ansible_collections/nullified/infrastructure/roles/workstation/tasks/window_manager.yml @@ -64,7 +64,7 @@ become_user: "{{ workstation_user_account }}" ansible.builtin.git: repo: https://github.com/lgi-devs/lgi.git - dest: /opt/git/foss/lua-lgi + dest: /srv/git/foss/lua-lgi force: false register: repo_clone failed_when: @@ -73,22 +73,22 @@ - name: '[lua-lgi] switch from LUA 5.1 to LUA 5.4' ansible.builtin.replace: - path: /opt/git/foss/lua-lgi/lgi/Makefile + path: /srv/git/foss/lua-lgi/lgi/Makefile regexp: '5\.1' replace: '5.4' - name: '[lua-lgi] building project' ansible.builtin.command: - chdir: /opt/git/foss/lua-lgi + chdir: /srv/git/foss/lua-lgi cmd: make all - creates: /opt/git/foss/lua-lgi/lgi/corelgilua51.so + creates: /srv/git/foss/lua-lgi/lgi/corelgilua51.so environment: LUA_CFLAGS: "-I/usr/include/lua5.4" - name: '[lua-lgi] compile and install' become: true ansible.builtin.command: - chdir: /opt/git/foss/lua-lgi + chdir: /srv/git/foss/lua-lgi cmd: make install creates: /usr/local/lib/lua/5.4/lgi/corelgilua51.so environment: @@ -120,7 +120,7 @@ become_user: "{{ workstation_user_account }}" ansible.builtin.git: repo: https://github.com/awesomeWM/awesome.git - dest: /opt/git/foss/awesomeWM + dest: /srv/git/foss/awesomeWM force: false register: repo_clone failed_when: @@ -131,16 +131,16 @@ become: true become_user: "{{ workstation_user_account }}" ansible.builtin.command: - chdir: /opt/git/foss/awesomeWM + chdir: /srv/git/foss/awesomeWM cmd: 'make' - creates: /opt/git/foss/awesomeWM/build + creates: /srv/git/foss/awesomeWM/build environment: CMAKE_ARGS: "-DWITH_DBUS=ON -DLUA_LIBRARY=/usr/lib/x86_64-linux-gnu/liblua5.4.so.0 -DLUA_INCLUDE_DIR=/usr/include/lua5.4" - name: '[awesomewm] building project' become: true ansible.builtin.command: - chdir: /opt/git/foss/awesomeWM + chdir: /srv/git/foss/awesomeWM cmd: make install creates: /usr/local/bin/awesome diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/awesome/background.png b/ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/awesome/background.png similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/awesome/background.png rename to ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/awesome/background.png diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/awesome/battery.lua b/ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/awesome/battery.lua similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/awesome/battery.lua rename to ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/awesome/battery.lua diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/awesome/rc.lua b/ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/awesome/rc.lua similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/awesome/rc.lua rename to ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/awesome/rc.lua diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/awesome/themes/powerarrow/theme-personal.lua b/ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/awesome/themes/powerarrow/theme-personal.lua similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/awesome/themes/powerarrow/theme-personal.lua rename to ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/awesome/themes/powerarrow/theme-personal.lua diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/terminator/config b/ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/terminator/config similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/terminator/config rename to ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/terminator/config diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/vlc/vlcrc b/ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/vlc/vlcrc similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/vlc/vlcrc rename to ansible_collections/nullified/infrastructure/roles/workstation/templates/.config/vlc/vlcrc diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/.xsession b/ansible_collections/nullified/infrastructure/roles/workstation/templates/.xsession similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/.xsession rename to ansible_collections/nullified/infrastructure/roles/workstation/templates/.xsession diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/bin_wrapper.sh.j2 b/ansible_collections/nullified/infrastructure/roles/workstation/templates/bin_wrapper.sh.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/bin_wrapper.sh.j2 rename to ansible_collections/nullified/infrastructure/roles/workstation/templates/bin_wrapper.sh.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/desktop_app.j2 b/ansible_collections/nullified/infrastructure/roles/workstation/templates/desktop_app.j2 similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/desktop_app.j2 rename to ansible_collections/nullified/infrastructure/roles/workstation/templates/desktop_app.j2 diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/system/xorg.conf b/ansible_collections/nullified/infrastructure/roles/workstation/templates/system/xorg.conf similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/workstation/templates/system/xorg.conf rename to ansible_collections/nullified/infrastructure/roles/workstation/templates/system/xorg.conf diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/tests/inventory b/ansible_collections/nullified/infrastructure/roles/workstation/tests/inventory similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/workstation/tests/inventory rename to ansible_collections/nullified/infrastructure/roles/workstation/tests/inventory diff --git a/collections/ansible_collections/nullified/infrastructure/roles/workstation/vars/main.yml b/ansible_collections/nullified/infrastructure/roles/workstation/vars/main.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/roles/workstation/vars/main.yml rename to ansible_collections/nullified/infrastructure/roles/workstation/vars/main.yml diff --git a/collections/ansible_collections/nullified/infrastructure/tests/config.yml b/ansible_collections/nullified/infrastructure/tests/config.yml similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/tests/config.yml rename to ansible_collections/nullified/infrastructure/tests/config.yml diff --git a/collections/ansible_collections/nullified/infrastructure/tests/sanity/ignore-2.15.txt b/ansible_collections/nullified/infrastructure/tests/sanity/ignore-2.15.txt similarity index 100% rename from collections/ansible_collections/nullified/infrastructure/tests/sanity/ignore-2.15.txt rename to ansible_collections/nullified/infrastructure/tests/sanity/ignore-2.15.txt diff --git a/collections/ansible_collections/nullified/infrastructure/extensions/ansible.cfg b/collections/ansible_collections/nullified/infrastructure/extensions/ansible.cfg deleted file mode 100644 index 96e5b91..0000000 --- a/collections/ansible_collections/nullified/infrastructure/extensions/ansible.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[defaults] -# target root path of the repository -home = ../../../../.. -remote_tmp = /tmp -local_tmp = /tmp -inject_facts_as_vars = False - -[privilege_escalation] diff --git a/scripts/generate_ansible_config.sh b/scripts/generate_ansible_config.sh index 9414839..cc90883 100755 --- a/scripts/generate_ansible_config.sh +++ b/scripts/generate_ansible_config.sh @@ -27,7 +27,7 @@ The following environment variables are supported for overrides: TMPL_INVENTORY_FILE: path where the main inventory file is located (current: "$TMPL_INVENTORY_FILE") TMPL_CONNECTION_TIMEOUT: default connection timeout when connecting to hosts (current: $TMPL_CONNECTION_TIMEOUT) TMPL_PLAYBOOK_DIR: path where the playbooks are located (current: "$TMPL_PLAYBOOK_DIR") - TMPL_COLLECTIONS_PATH: path where the collections (custom and galaxy) are located (current: "$TMPL_COLLECTIONS_PATH") + TMPL_COLLECTIONS_PATH: path where the collections (custom and galaxy) are located (current: "$TMPL_COLLECTIONS_PATH_CLEARED") EOF } @@ -40,7 +40,14 @@ TMPL_PROJECT_ROOT=$(realpath "${TMPL_PROJECT_ROOT:-"${SCRIPT_DIR}/.."}") TMPL_INVENTORY_FILE=$(realpath "${TMPL_INVENTORY_FILE:-"${TMPL_PROJECT_ROOT}/inventory/inventory.yml"}") TMPL_CONNECTION_TIMEOUT=${TMPL_CONNECTION_TIMEOUT:-30} TMPL_PLAYBOOK_DIR=$(realpath "${TMPL_PLAYBOOK_DIR:-"${TMPL_PROJECT_ROOT}/playbooks"}") -TMPL_COLLECTIONS_PATH=$(realpath "${TMPL_COLLECTIONS_PATH:-"${TMPL_PROJECT_ROOT}/collections/ansible_collections"}") +TMPL_COLLECTIONS_PATH="${TMPL_COLLECTIONS_PATH:-"${TMPL_PROJECT_ROOT}/galaxy:${TMPL_PROJECT_ROOT}"}" +TMPL_COLLECTIONS_PATH_CLEARED= +for item in ${TMPL_COLLECTIONS_PATH//:/ }; do + if [ -n "${TMPL_COLLECTIONS_PATH_CLEARED}" ]; then + TMPL_COLLECTIONS_PATH_CLEARED+=":" + fi + TMPL_COLLECTIONS_PATH_CLEARED+=$(realpath "${item}") +done OPTS=ho LONGOPTS=help,overwrite @@ -92,7 +99,7 @@ error_on_undefined_vars = True force_handlers = True home = ${TMPL_PROJECT_ROOT} inventory = ${TMPL_INVENTORY_FILE} -collections_path = ${TMPL_COLLECTIONS_PATH} +collections_path = ${TMPL_COLLECTIONS_PATH_CLEARED} local_tmp = /tmp nocolor = 0 nocows = 0