Update spacing in main YML files.
This commit is contained in:
+22
-3
@@ -1,40 +1,46 @@
|
||||
---
|
||||
|
||||
####### Lock #######
|
||||
|
||||
# Ensure a process is not already running.
|
||||
- name: Main | Lock
|
||||
block:
|
||||
|
||||
- name: Main | Lock | Check
|
||||
ansible.builtin.include_tasks: tasks/general/tests/lock_check.yml
|
||||
|
||||
- name: Main | Lock | Create
|
||||
ansible.builtin.include_tasks: tasks/general/tests/lock_create.yml
|
||||
|
||||
|
||||
####### Gather #######
|
||||
|
||||
# Load facts for all systems.
|
||||
- name: Main | Gather
|
||||
block:
|
||||
|
||||
- name: Main | Gather | Facts
|
||||
ansible.builtin.include_tasks: facts/general/gather.yml
|
||||
|
||||
- name: Main | Gather | Account Management
|
||||
ansible.builtin.include_tasks: tasks/general/acct_mgmt/provision_config.yml
|
||||
|
||||
- name: Main | Gather | System
|
||||
ansible.builtin.include_tasks: facts/general/system.yml
|
||||
|
||||
- name: Main | Gather | Package
|
||||
ansible.builtin.include_tasks: facts/general/package.yml
|
||||
|
||||
- name: Main | Gather | Service
|
||||
ansible.builtin.include_tasks: facts/general/service.yml
|
||||
|
||||
- name: Main | Gather | User
|
||||
ansible.builtin.include_tasks: facts/general/user.yml
|
||||
|
||||
- name: Main | Gather | Internet Check
|
||||
ansible.builtin.include_tasks: tasks/general/tests/internet_check.yml
|
||||
|
||||
|
||||
####### Start #######
|
||||
|
||||
- name: Main | Start
|
||||
block:
|
||||
|
||||
@@ -46,6 +52,7 @@
|
||||
when: workstation
|
||||
|
||||
####### NixOS #######
|
||||
|
||||
# Install the .nix files and do a little data setup.
|
||||
- name: Main | NixOS Setup
|
||||
block:
|
||||
@@ -59,12 +66,17 @@
|
||||
ansible.builtin.include_tasks: tasks/general/software/swap.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
|
||||
|
||||
- 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
|
||||
|
||||
- ansible.builtin.include_tasks: tasks/general/cron/ansible.yml
|
||||
@@ -78,7 +90,9 @@
|
||||
# Try including these. Really need to get NixOS working with the rest!
|
||||
#- 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
|
||||
@@ -86,8 +100,8 @@
|
||||
|
||||
when: ansible_distribution == "NixOS"
|
||||
|
||||
|
||||
####### General #######
|
||||
|
||||
# Basic setup for all enabled systems.
|
||||
- name: Main | General Setup
|
||||
block:
|
||||
@@ -119,8 +133,11 @@
|
||||
- ansible.builtin.include_tasks: tasks/general/settings/keyboard.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
|
||||
|
||||
@@ -128,7 +145,9 @@
|
||||
when: internet
|
||||
|
||||
- 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
|
||||
|
||||
- ansible.builtin.include_tasks: tasks/general/cron/ansible.yml
|
||||
|
||||
Reference in New Issue
Block a user