diff --git a/local.yml b/local.yml index 583298b..21407b5 100644 --- a/local.yml +++ b/local.yml @@ -14,8 +14,8 @@ - name: Main | Lock block: - - include_tasks: tasks/general/tests/lock_check.yml - - include_tasks: tasks/general/tests/lock_create.yml + - ansible.builtin.include_tasks: tasks/general/tests/lock_check.yml + - ansible.builtin.include_tasks: tasks/general/tests/lock_create.yml ####### Gather ####### @@ -23,22 +23,22 @@ - name: Main | Gather block: - - include_tasks: facts/general/gather.yml - - include_tasks: tasks/general/acct_mgmt/provision_config.yml + - ansible.builtin.include_tasks: facts/general/gather.yml + - ansible.builtin.include_tasks: tasks/general/acct_mgmt/provision_config.yml - - include_tasks: facts/general/system.yml - - include_tasks: facts/general/package.yml - - include_tasks: facts/general/service.yml - - include_tasks: facts/general/user.yml + - ansible.builtin.include_tasks: facts/general/system.yml + - ansible.builtin.include_tasks: facts/general/package.yml + - ansible.builtin.include_tasks: facts/general/service.yml + - ansible.builtin.include_tasks: facts/general/user.yml - - include_tasks: tasks/general/tests/internet_check.yml + - ansible.builtin.include_tasks: tasks/general/tests/internet_check.yml ####### Start ####### - name: Main | Start block: - - include_tasks: tasks/general/acct_mgmt/notify.yml + - ansible.builtin.include_tasks: tasks/general/acct_mgmt/notify.yml vars: notify_message: "Provisioning Started" @@ -49,34 +49,34 @@ - name: Main | NixOS Setup block: - - include_tasks: tasks/general/software/nixos.yml + - ansible.builtin.include_tasks: tasks/general/software/nixos.yml # TBD if we are going to use this many, then just have IF statements # and use blocks within the General area for NixOS vs not-NixOS. - - include_tasks: tasks/general/software/swap.yml + - ansible.builtin.include_tasks: tasks/general/software/swap.yml - - include_tasks: tasks/general/acct_mgmt/groups.yml - - include_tasks: tasks/general/acct_mgmt/users.yml - - include_tasks: tasks/general/acct_mgmt/sudo.yml - - include_tasks: tasks/general/acct_mgmt/doas.yml + - ansible.builtin.include_tasks: tasks/general/acct_mgmt/groups.yml + - ansible.builtin.include_tasks: tasks/general/acct_mgmt/users.yml + - ansible.builtin.include_tasks: tasks/general/acct_mgmt/sudo.yml + - ansible.builtin.include_tasks: tasks/general/acct_mgmt/doas.yml - - include_tasks: tasks/general/scripts/root.yml - - include_tasks: tasks/general/scripts/user.yml - - include_tasks: tasks/general/scripts/install.yml + - ansible.builtin.include_tasks: tasks/general/scripts/root.yml + - ansible.builtin.include_tasks: tasks/general/scripts/user.yml + - ansible.builtin.include_tasks: tasks/general/scripts/install.yml - - include_tasks: tasks/general/cron/ansible.yml + - ansible.builtin.include_tasks: tasks/general/cron/ansible.yml # psutil does not work in NixOS. Cannot figure out how to fix it. Maybe # time to start looking into home-manager but still not wanting to # maintain two different GNOME setups. HMMMM! - - include_tasks: tasks/workstation/shared/settings/gnome.yml + - ansible.builtin.include_tasks: tasks/workstation/shared/settings/gnome.yml when: workstation # Try including these. Really need to get NixOS working with the rest! - #- include_tasks: tasks/general/software/telegraf.yml # "Could not find a module for unknown."" - - include_tasks: tasks/general/tests/services.yml - - include_tasks: tasks/general/tests/lynis.yml - - include_tasks: tasks/general/tests/nmap.yml + #- ansible.builtin.include_tasks: tasks/general/software/telegraf.yml # "Could not find a module for unknown."" + - ansible.builtin.include_tasks: tasks/general/tests/services.yml + - ansible.builtin.include_tasks: tasks/general/tests/lynis.yml + - ansible.builtin.include_tasks: tasks/general/tests/nmap.yml - name: NixOS | Complete ansible.builtin.meta: end_play @@ -89,42 +89,42 @@ - name: Main | General Setup block: - - include_tasks: tasks/general/software/swap.yml - - include_tasks: tasks/general/software/packages.yml + - ansible.builtin.include_tasks: tasks/general/software/swap.yml + - ansible.builtin.include_tasks: tasks/general/software/packages.yml when: internet - - include_tasks: tasks/general/software/services.yml - - include_tasks: tasks/general/software/sendmail.yml + - ansible.builtin.include_tasks: tasks/general/software/services.yml + - ansible.builtin.include_tasks: tasks/general/software/sendmail.yml when: ansible_system == "FreeBSD" and internet - - include_tasks: tasks/general/software/aur.yml + - ansible.builtin.include_tasks: tasks/general/software/aur.yml when: internet and ansible_pkg_mgr == "pacman" # Gather again in case missing programs have now been installed. - - include_tasks: facts/general/gather.yml + - ansible.builtin.include_tasks: facts/general/gather.yml - - include_tasks: tasks/general/settings/keyboard.yml + - ansible.builtin.include_tasks: tasks/general/settings/keyboard.yml - - include_tasks: tasks/general/acct_mgmt/groups.yml - - include_tasks: tasks/general/acct_mgmt/users.yml - - include_tasks: tasks/general/acct_mgmt/sudo.yml - - include_tasks: tasks/general/acct_mgmt/doas.yml + - ansible.builtin.include_tasks: tasks/general/acct_mgmt/groups.yml + - ansible.builtin.include_tasks: tasks/general/acct_mgmt/users.yml + - ansible.builtin.include_tasks: tasks/general/acct_mgmt/sudo.yml + - ansible.builtin.include_tasks: tasks/general/acct_mgmt/doas.yml when: internet - - include_tasks: tasks/general/software/env-shared.yml + - ansible.builtin.include_tasks: tasks/general/software/env-shared.yml when: internet - - include_tasks: tasks/general/scripts/root.yml - - include_tasks: tasks/general/scripts/user.yml - - include_tasks: tasks/general/scripts/install.yml + - ansible.builtin.include_tasks: tasks/general/scripts/root.yml + - ansible.builtin.include_tasks: tasks/general/scripts/user.yml + - ansible.builtin.include_tasks: tasks/general/scripts/install.yml - - include_tasks: tasks/general/cron/ansible.yml + - ansible.builtin.include_tasks: tasks/general/cron/ansible.yml # TODO Need to refactor. Maybe tasks/general/cron/freebsd.yml - - include_tasks: tasks/workstation/freebsd/cron/ansible.yml + - ansible.builtin.include_tasks: tasks/workstation/freebsd/cron/ansible.yml when: ansible_system == "FreeBSD" - - include_tasks: tasks/general/software/metasploit.yml + - ansible.builtin.include_tasks: tasks/general/software/metasploit.yml when: internet when: provision @@ -135,31 +135,31 @@ - name: Main | Workstation Setup block: - - include_tasks: facts/workstation/package.yml + - ansible.builtin.include_tasks: facts/workstation/package.yml ## Desktop Environments ## - - include_tasks: tasks/workstation/freebsd/software/gpu.yml + - ansible.builtin.include_tasks: tasks/workstation/freebsd/software/gpu.yml when: ansible_system == "FreeBSD" and bsd_gpu and internet # Window Managers without true Desktop Environments # - - include_tasks: tasks/workstation/shared/software/dwm.yml + - ansible.builtin.include_tasks: tasks/workstation/shared/software/dwm.yml when: internet - - include_tasks: tasks/workstation/shared/software/i3.yml + - ansible.builtin.include_tasks: tasks/workstation/shared/software/i3.yml when: internet # Polished Desktop Environments # - - include_tasks: tasks/workstation/freebsd/software/gnome.yml + - ansible.builtin.include_tasks: tasks/workstation/freebsd/software/gnome.yml when: ansible_system == "FreeBSD" and internet - name: Main | Workstation | Fancy Desktop Environments block: - - include_tasks: tasks/workstation/linux/software/gnome.yml + - ansible.builtin.include_tasks: tasks/workstation/linux/software/gnome.yml when: ansible_service_mgr == "systemd" - - include_tasks: tasks/workstation/linux/software/cinnamon.yml - - include_tasks: tasks/workstation/linux/software/lxqt.yml + - ansible.builtin.include_tasks: tasks/workstation/linux/software/cinnamon.yml + - ansible.builtin.include_tasks: tasks/workstation/linux/software/lxqt.yml when: ansible_system == "Linux" and internet # TBD: Implement this: and extra_desktops @@ -168,56 +168,56 @@ - name: Main | Workstation Setup | Linux block: - - include_tasks: tasks/workstation/linux/software/packages.yml - - include_tasks: tasks/workstation/linux/software/tlp.yml - - include_tasks: tasks/workstation/linux/software/lutris.yml - - include_tasks: tasks/workstation/linux/software/vscodium.yml - - include_tasks: tasks/workstation/linux/software/vpn.yml - - include_tasks: tasks/workstation/linux/software/nodejs.yml - - include_tasks: tasks/workstation/linux/software/hugo.yml - - include_tasks: tasks/workstation/linux/software/brave.yml + - ansible.builtin.include_tasks: tasks/workstation/linux/software/packages.yml + - ansible.builtin.include_tasks: tasks/workstation/linux/software/tlp.yml + - ansible.builtin.include_tasks: tasks/workstation/linux/software/lutris.yml + - ansible.builtin.include_tasks: tasks/workstation/linux/software/vscodium.yml + - ansible.builtin.include_tasks: tasks/workstation/linux/software/vpn.yml + - ansible.builtin.include_tasks: tasks/workstation/linux/software/nodejs.yml + - ansible.builtin.include_tasks: tasks/workstation/linux/software/hugo.yml + - ansible.builtin.include_tasks: tasks/workstation/linux/software/brave.yml when: ansible_pkg_mgr in ("apt", "dnf", "zypper") and not mobile when: ansible_system == "Linux" and internet - - include_tasks: tasks/workstation/freebsd/software/packages.yml + - ansible.builtin.include_tasks: tasks/workstation/freebsd/software/packages.yml when: ansible_system == "FreeBSD" and internet - - include_tasks: tasks/workstation/mac-os/software/brew.yml + - ansible.builtin.include_tasks: tasks/workstation/mac-os/software/brew.yml when: ansible_system == "Darwin" and internet ## Configuration Tasks ## - name: Main | Workstation Setup | Configuration block: - - include_tasks: tasks/workstation/shared/settings/gnome.yml - - include_tasks: tasks/workstation/shared/settings/cinnamon.yml - - include_tasks: tasks/workstation/shared/settings/xdg_autostart.yml + - ansible.builtin.include_tasks: tasks/workstation/shared/settings/gnome.yml + - ansible.builtin.include_tasks: tasks/workstation/shared/settings/cinnamon.yml + - ansible.builtin.include_tasks: tasks/workstation/shared/settings/xdg_autostart.yml - - include_tasks: tasks/workstation/linux/cron/ansible.yml + - ansible.builtin.include_tasks: tasks/workstation/linux/cron/ansible.yml when: ansible_system == "Linux" when: not mobile - - include_tasks: tasks/workstation/shared/settings/nfs.yml + - ansible.builtin.include_tasks: tasks/workstation/shared/settings/nfs.yml - - include_tasks: tasks/workstation/shared/settings/rdp.yml + - ansible.builtin.include_tasks: tasks/workstation/shared/settings/rdp.yml when: rdp - - include_tasks: tasks/workstation/shared/settings/vnc.yml + - ansible.builtin.include_tasks: tasks/workstation/shared/settings/vnc.yml when: vnc - - include_tasks: tasks/workstation/shared/settings/services.yml - - include_tasks: tasks/workstation/shared/settings/templates.yml + - ansible.builtin.include_tasks: tasks/workstation/shared/settings/services.yml + - ansible.builtin.include_tasks: tasks/workstation/shared/settings/templates.yml ## Final Tasks (SLOW) ## - name: Main | Workstation Setup | Linux [Slow] block: - - include_tasks: tasks/workstation/linux/software/flatpaks.yml + - ansible.builtin.include_tasks: tasks/workstation/linux/software/flatpaks.yml when: flatpak_distro - - include_tasks: tasks/workstation/linux/software/java.yml - - include_tasks: tasks/workstation/linux/software/flutter.yml - - include_tasks: tasks/workstation/linux/software/android.yml + - ansible.builtin.include_tasks: tasks/workstation/linux/software/java.yml + - ansible.builtin.include_tasks: tasks/workstation/linux/software/flutter.yml + - ansible.builtin.include_tasks: tasks/workstation/linux/software/android.yml when: ansible_system == "Linux" and internet @@ -232,35 +232,35 @@ # block: # # ##### Setup ##### -# - include_tasks: tasks/miner/debug.yml +# - ansible.builtin.include_tasks: tasks/miner/debug.yml # -# - include_tasks: tasks/miner/acct_mgmt/users.yml +# - ansible.builtin.include_tasks: tasks/miner/acct_mgmt/users.yml # -# - include_tasks: facts/miner/system.yml -# - include_tasks: facts/miner/config.yml -# - include_tasks: facts/miner/pool.yml +# - ansible.builtin.include_tasks: facts/miner/system.yml +# - ansible.builtin.include_tasks: facts/miner/config.yml +# - ansible.builtin.include_tasks: facts/miner/pool.yml # # ##### Installations ##### # ### CPU SECTION ### # # Monero # -# - include_tasks: tasks/miner/software/xmr-stak-cpu.yml +# - ansible.builtin.include_tasks: tasks/miner/software/xmr-stak-cpu.yml # when: xmr_stak_cpu is defined # # ### GPU Section ### # ## Drivers ## -# - include_tasks: tasks/miner/drivers/amdgpu.yml +# - ansible.builtin.include_tasks: tasks/miner/drivers/amdgpu.yml # when: ansible_distribution == "Ubuntu" and amdgpu # # # Ethereum # -# - include_tasks: tasks/miner/software/ethminer.yml +# - ansible.builtin.include_tasks: tasks/miner/software/ethminer.yml # when: ethminer # -# - include_tasks: tasks/miner/software/nanominer.yml +# - ansible.builtin.include_tasks: tasks/miner/software/nanominer.yml # when: nanominer # # ##### Scheduling ##### -# - include_tasks: tasks/miner/cron/ansible.yml -# - include_tasks: tasks/miner/cron/mfn.yml +# - ansible.builtin.include_tasks: tasks/miner/cron/ansible.yml +# - ansible.builtin.include_tasks: tasks/miner/cron/mfn.yml # # when: miner @@ -270,25 +270,25 @@ - name: Main | Server Setup block: - - include_tasks: tasks/server/software/services.yml + - ansible.builtin.include_tasks: tasks/server/software/services.yml - block: - - include_tasks: tasks/server/software/certbot.yml - - include_tasks: tasks/server/cron/certbot.yml + - ansible.builtin.include_tasks: tasks/server/software/certbot.yml + - ansible.builtin.include_tasks: tasks/server/cron/certbot.yml when: certbot - block: - - include_tasks: tasks/server/software/onlyoffice.yml + - ansible.builtin.include_tasks: tasks/server/software/onlyoffice.yml when: onlyoffice - - include_tasks: tasks/server/software/influxdb1.yml + - ansible.builtin.include_tasks: tasks/server/software/influxdb1.yml when: influxdb1 - - include_tasks: tasks/server/software/influxdb2.yml + - ansible.builtin.include_tasks: tasks/server/software/influxdb2.yml when: influxdb2 - - include_tasks: tasks/server/software/grafana.yml + - ansible.builtin.include_tasks: tasks/server/software/grafana.yml when: grafana when: ansible_pkg_mgr == "apt" - - include_tasks: tasks/server/software/hugo.yml + - ansible.builtin.include_tasks: tasks/server/software/hugo.yml when: hugo when: server @@ -299,20 +299,20 @@ - name: Main | Reporting block: - - include_tasks: tasks/general/software/telegraf.yml + - ansible.builtin.include_tasks: tasks/general/software/telegraf.yml when: internet - - include_tasks: tasks/general/tests/services.yml - - include_tasks: tasks/general/tests/lynis.yml - - include_tasks: tasks/general/tests/nmap.yml + - ansible.builtin.include_tasks: tasks/general/tests/services.yml + - ansible.builtin.include_tasks: tasks/general/tests/lynis.yml + - ansible.builtin.include_tasks: tasks/general/tests/nmap.yml ####### Finish ####### - name: Main | Finish block: - - include_tasks: tasks/general/acct_mgmt/notify.yml + - ansible.builtin.include_tasks: tasks/general/acct_mgmt/notify.yml vars: notify_message: "Provisioning Finished" - - include_tasks: tasks/general/tests/lock_remove.yml + - ansible.builtin.include_tasks: tasks/general/tests/lock_remove.yml