Refactor redundant names, do not need to say "Setup".

This commit is contained in:
me
2026-10-10 16:48:08 -07:00
parent 019066c4dc
commit 942780e6d1
2 changed files with 23 additions and 21 deletions
+13 -11
View File
@@ -2,7 +2,7 @@
# Harmonize systems rather than doing everything manually. :) # Harmonize systems rather than doing everything manually. :)
# Setup of any device connected to this repo. # Setup of any device connected to this repo.
- name: Main | Default Setup - name: Local | Main
hosts: localhost hosts: localhost
connection: local connection: local
become: true become: true
@@ -17,7 +17,7 @@
####### Workstations ####### ####### Workstations #######
# Additional setup for systems with GUI. # Additional setup for systems with GUI.
- name: Main | Workstation Setup - name: Main | Workstation
block: block:
- ansible.builtin.include_tasks: facts/workstation/package.yml - ansible.builtin.include_tasks: facts/workstation/package.yml
@@ -56,7 +56,7 @@
## Software Tasks ## ## Software Tasks ##
- name: Main | Workstation Setup | Linux - name: Main | Workstation | Linux
block: block:
- ansible.builtin.include_tasks: tasks/workstation/linux/software/packages.yml - ansible.builtin.include_tasks: tasks/workstation/linux/software/packages.yml
@@ -88,7 +88,8 @@
and internet and internet
## Configuration Tasks ## ## Configuration Tasks ##
- name: Main | Workstation Setup | Configuration
- name: Main | Workstation | Configuration
block: block:
- ansible.builtin.include_tasks: tasks/workstation/shared/settings/gnome.yml - ansible.builtin.include_tasks: tasks/workstation/shared/settings/gnome.yml
@@ -115,7 +116,8 @@
- ansible.builtin.include_tasks: tasks/workstation/shared/settings/templates.yml - ansible.builtin.include_tasks: tasks/workstation/shared/settings/templates.yml
## Final Tasks (SLOW) ## ## Final Tasks (SLOW) ##
- name: Main | Workstation Setup | Linux [Slow]
- name: Main | Workstation | Linux [Slow]
block: block:
- ansible.builtin.include_tasks: tasks/workstation/linux/software/flatpaks.yml - ansible.builtin.include_tasks: tasks/workstation/linux/software/flatpaks.yml
@@ -138,7 +140,7 @@
# ####### Miners ####### # ####### Miners #######
# #
# # Additional setup for miners. # # Additional setup for miners.
# - name: Main | Miner Setup # - name: Main | Miner
# block: # block:
# #
# ##### Setup ##### # ##### Setup #####
@@ -177,24 +179,24 @@
####### Servers ####### ####### Servers #######
# Easy to deploy server configurations. # Easy to deploy server configurations.
- name: Main | Server Setup - name: Main | Server
block: block:
- name: Main | Server Setup | Services - name: Main | Server | Services
ansible.builtin.include_tasks: tasks/server/software/services.yml ansible.builtin.include_tasks: tasks/server/software/services.yml
- block: - block:
- name: Main | Server Setup | Certbot - name: Main | Server | Certbot
ansible.builtin.include_tasks: tasks/server/software/certbot.yml ansible.builtin.include_tasks: tasks/server/software/certbot.yml
- name: Main | Server Setup | Certbot Cron - name: Main | Server | Certbot Cron
ansible.builtin.include_tasks: tasks/server/cron/certbot.yml ansible.builtin.include_tasks: tasks/server/cron/certbot.yml
when: certbot when: certbot
- block: - block:
- name: Main | Server Setup | OnlyOffice - name: Main | Server | OnlyOffice
ansible.builtin.include_tasks: tasks/server/software/onlyoffice.yml ansible.builtin.include_tasks: tasks/server/software/onlyoffice.yml
when: onlyoffice when: onlyoffice
+10 -10
View File
@@ -54,15 +54,15 @@
####### NixOS ####### ####### NixOS #######
# Install the .nix files and do a little data setup. # Install the .nix files and do a little data setup.
- name: Main | NixOS Setup - name: Main | NixOS
block: block:
- name: Main | NixOS Setup | NixOS - name: Main | NixOS | Config
ansible.builtin.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 # 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. # and use blocks within the General area for NixOS vs not-NixOS.
- name: Main | NixOS Setup | Swap - name: Main | NixOS | Swap
ansible.builtin.include_tasks: tasks/general/software/swap.yml 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/groups.yml
@@ -95,7 +95,7 @@
- ansible.builtin.include_tasks: tasks/general/tests/nmap.yml - ansible.builtin.include_tasks: tasks/general/tests/nmap.yml
- name: NixOS | Complete - name: Main | NixOS | Complete
ansible.builtin.meta: end_play ansible.builtin.meta: end_play
when: ansible_distribution == "NixOS" when: ansible_distribution == "NixOS"
@@ -103,23 +103,23 @@
####### General ####### ####### General #######
# Basic setup for all enabled systems. # Basic setup for all enabled systems.
- name: Main | General Setup - name: Main | General
block: block:
- name: Main | General Setup | Swap - name: Main | General | Swap
ansible.builtin.include_tasks: tasks/general/software/swap.yml ansible.builtin.include_tasks: tasks/general/software/swap.yml
- name: Main | General Setup | runit - name: Main | General | runit
ansible.builtin.include_tasks: tasks/general/software/runit.yml ansible.builtin.include_tasks: tasks/general/software/runit.yml
- name: Main | General Setup | Packages - name: Main | General | Packages
ansible.builtin.include_tasks: tasks/general/software/packages.yml ansible.builtin.include_tasks: tasks/general/software/packages.yml
when: internet when: internet
- name: Main | General Setup | Services - name: Main | General | Services
ansible.builtin.include_tasks: tasks/general/software/services.yml ansible.builtin.include_tasks: tasks/general/software/services.yml
- name: Main | General Setup | Sendmail - name: Main | General | Sendmail
ansible.builtin.include_tasks: tasks/general/software/sendmail.yml ansible.builtin.include_tasks: tasks/general/software/sendmail.yml
when: ansible_system == "FreeBSD" when: ansible_system == "FreeBSD"
and internet and internet