From 5ecab2b527b8061cf7e1fbd291cc2a24d30622c0 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Tue, 17 Sep 2024 22:12:06 +0100 Subject: [PATCH 1/2] Begin extracting a base role --- dotfiles.yml | 5 +---- roles/base/tasks/main.yml | 5 +++++ {tasks => roles/base/tasks}/packages.yml | 0 {tasks => roles/base/tasks}/user.yml | 0 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 roles/base/tasks/main.yml rename {tasks => roles/base/tasks}/packages.yml (100%) rename {tasks => roles/base/tasks}/user.yml (100%) diff --git a/dotfiles.yml b/dotfiles.yml index 46c7602..2223275 100644 --- a/dotfiles.yml +++ b/dotfiles.yml @@ -11,11 +11,8 @@ file: host_vars/{{ ansible_hostname }}.yml failed_when: false - - import_tasks: tasks/user.yml - - import_tasks: tasks/packages.yml - - include_role: - name: geerlingguy.ntp + name: base - import_tasks: tasks/boot.yml - import_tasks: tasks/i3.yml diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml new file mode 100644 index 0000000..514ea2b --- /dev/null +++ b/roles/base/tasks/main.yml @@ -0,0 +1,5 @@ +- import_tasks: user.yml +- import_tasks: packages.yml + +- include_role: + name: geerlingguy.ntp diff --git a/tasks/packages.yml b/roles/base/tasks/packages.yml similarity index 100% rename from tasks/packages.yml rename to roles/base/tasks/packages.yml diff --git a/tasks/user.yml b/roles/base/tasks/user.yml similarity index 100% rename from tasks/user.yml rename to roles/base/tasks/user.yml -- 2.45.2 From adbc843ecf593493cba11a215db584dcf5fb1529 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Wed, 18 Sep 2024 14:37:56 +0100 Subject: [PATCH 2/2] Move boot tasks to base role --- dotfiles.yml | 1 - {tasks => roles/base/tasks}/boot.yml | 0 roles/base/tasks/main.yml | 2 ++ 3 files changed, 2 insertions(+), 1 deletion(-) rename {tasks => roles/base/tasks}/boot.yml (100%) diff --git a/dotfiles.yml b/dotfiles.yml index 2223275..6177984 100644 --- a/dotfiles.yml +++ b/dotfiles.yml @@ -14,7 +14,6 @@ - include_role: name: base - - import_tasks: tasks/boot.yml - import_tasks: tasks/i3.yml # Don't bother configuring KDE for root, just assume it's for me diff --git a/tasks/boot.yml b/roles/base/tasks/boot.yml similarity index 100% rename from tasks/boot.yml rename to roles/base/tasks/boot.yml diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 514ea2b..eafd4d5 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -3,3 +3,5 @@ - include_role: name: geerlingguy.ntp + +- import_tasks: boot.yml -- 2.45.2