From 02834261274843bdd5d2ee850dc8403b01f6d179 Mon Sep 17 00:00:00 2001 From: Matej Focko Date: Fri, 12 Jul 2024 21:05:18 +0200 Subject: [PATCH] chore: move out the base roles Signed-off-by: Matej Focko --- playbooks/bootstrap.yml | 4 ++-- roles/{user/base => base/desktop}/files/srht.py | 0 roles/{user/base => base/desktop}/files/toolbox_name.sh | 0 roles/{user/base => base/desktop}/tasks/desktop-utilities.yml | 0 roles/{user/base => base/desktop}/tasks/main.yml | 4 ++-- roles/{user/base => base/desktop}/tasks/scripts.yml | 0 roles/{user/base => base/desktop}/tasks/structure.yml | 0 roles/{server/base => base/server}/tasks/main.yml | 0 roles/{system/base => base/system}/tasks/main.yml | 0 roles/{system/base => base/system}/tasks/upgrade.yml | 0 10 files changed, 4 insertions(+), 4 deletions(-) rename roles/{user/base => base/desktop}/files/srht.py (100%) rename roles/{user/base => base/desktop}/files/toolbox_name.sh (100%) rename roles/{user/base => base/desktop}/tasks/desktop-utilities.yml (100%) rename roles/{user/base => base/desktop}/tasks/main.yml (79%) rename roles/{user/base => base/desktop}/tasks/scripts.yml (100%) rename roles/{user/base => base/desktop}/tasks/structure.yml (100%) rename roles/{server/base => base/server}/tasks/main.yml (100%) rename roles/{system/base => base/system}/tasks/main.yml (100%) rename roles/{system/base => base/system}/tasks/upgrade.yml (100%) diff --git a/playbooks/bootstrap.yml b/playbooks/bootstrap.yml index 786be94..91c1ad0 100644 --- a/playbooks/bootstrap.yml +++ b/playbooks/bootstrap.yml @@ -13,7 +13,7 @@ when: ansible_distribution in [ "AlmaLinux", "CentOS" ] # Upgrade all packages and install the basic-bitch ones - - role: system/base + - role: base/system become: true # Enable Cockpit @@ -37,7 +37,7 @@ tags: sshd # Handle basic user configuration - - user/base + - base/desktop # Shell utilities - role: user/shell/zsh diff --git a/roles/user/base/files/srht.py b/roles/base/desktop/files/srht.py similarity index 100% rename from roles/user/base/files/srht.py rename to roles/base/desktop/files/srht.py diff --git a/roles/user/base/files/toolbox_name.sh b/roles/base/desktop/files/toolbox_name.sh similarity index 100% rename from roles/user/base/files/toolbox_name.sh rename to roles/base/desktop/files/toolbox_name.sh diff --git a/roles/user/base/tasks/desktop-utilities.yml b/roles/base/desktop/tasks/desktop-utilities.yml similarity index 100% rename from roles/user/base/tasks/desktop-utilities.yml rename to roles/base/desktop/tasks/desktop-utilities.yml diff --git a/roles/user/base/tasks/main.yml b/roles/base/desktop/tasks/main.yml similarity index 79% rename from roles/user/base/tasks/main.yml rename to roles/base/desktop/tasks/main.yml index bcc1f7c..20f32cc 100644 --- a/roles/user/base/tasks/main.yml +++ b/roles/base/desktop/tasks/main.yml @@ -4,8 +4,8 @@ - name: Scripts ansible.builtin.include_tasks: scripts.yml - tags: user/base/scripts + tags: base/user/scripts - name: Desktop utilities ansible.builtin.include_tasks: desktop-utilities.yml - tags: user/base/desktop-utilities + tags: base/user/desktop-utilities diff --git a/roles/user/base/tasks/scripts.yml b/roles/base/desktop/tasks/scripts.yml similarity index 100% rename from roles/user/base/tasks/scripts.yml rename to roles/base/desktop/tasks/scripts.yml diff --git a/roles/user/base/tasks/structure.yml b/roles/base/desktop/tasks/structure.yml similarity index 100% rename from roles/user/base/tasks/structure.yml rename to roles/base/desktop/tasks/structure.yml diff --git a/roles/server/base/tasks/main.yml b/roles/base/server/tasks/main.yml similarity index 100% rename from roles/server/base/tasks/main.yml rename to roles/base/server/tasks/main.yml diff --git a/roles/system/base/tasks/main.yml b/roles/base/system/tasks/main.yml similarity index 100% rename from roles/system/base/tasks/main.yml rename to roles/base/system/tasks/main.yml diff --git a/roles/system/base/tasks/upgrade.yml b/roles/base/system/tasks/upgrade.yml similarity index 100% rename from roles/system/base/tasks/upgrade.yml rename to roles/base/system/tasks/upgrade.yml