summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--essential.yml3
-rw-r--r--roles/atop/handlers/main.yml (renamed from roles/essential/handlers/atop.yml)0
-rw-r--r--roles/atop/tasks/main.yml (renamed from roles/essential/tasks/atop.yml)0
-rw-r--r--roles/essential/handlers/main.yml1
-rw-r--r--roles/essential/tasks/main.yml4
-rw-r--r--roles/minimal/tasks/main.yml2
-rw-r--r--roles/sudo/tasks/main.yml (renamed from roles/essential/tasks/sudo.yml)0
-rw-r--r--roles/users/files/id_rsa.pub (renamed from roles/essential/files/id_rsa.pub)0
-rw-r--r--roles/users/tasks/main.yml (renamed from roles/essential/tasks/users.yml)2
9 files changed, 5 insertions, 7 deletions
diff --git a/essential.yml b/essential.yml
index 4e369ad..dc08d81 100644
--- a/essential.yml
+++ b/essential.yml
@@ -2,3 +2,6 @@
hosts: all
roles:
- { role: minimal }
+ - { role: users }
+ - { role: sudo }
+ - { role: atop }
diff --git a/roles/essential/handlers/atop.yml b/roles/atop/handlers/main.yml
index 33ed20d..33ed20d 100644
--- a/roles/essential/handlers/atop.yml
+++ b/roles/atop/handlers/main.yml
diff --git a/roles/essential/tasks/atop.yml b/roles/atop/tasks/main.yml
index 7617f68..7617f68 100644
--- a/roles/essential/tasks/atop.yml
+++ b/roles/atop/tasks/main.yml
diff --git a/roles/essential/handlers/main.yml b/roles/essential/handlers/main.yml
deleted file mode 100644
index 2ea72d6..0000000
--- a/roles/essential/handlers/main.yml
+++ /dev/null
@@ -1 +0,0 @@
-- ansible.builtin.import_tasks: roles/essential/handlers/atop.yml
diff --git a/roles/essential/tasks/main.yml b/roles/essential/tasks/main.yml
deleted file mode 100644
index fbcf875..0000000
--- a/roles/essential/tasks/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-- ansible.builtin.import_tasks: roles/essential/tasks/packages.yml
-- ansible.builtin.import_tasks: roles/essential/tasks/users.yml
-- ansible.builtin.import_tasks: roles/essential/tasks/sudo.yml
-- ansible.builtin.import_tasks: roles/essential/tasks/atop.yml
diff --git a/roles/minimal/tasks/main.yml b/roles/minimal/tasks/main.yml
index e0f0390..ff85579 100644
--- a/roles/minimal/tasks/main.yml
+++ b/roles/minimal/tasks/main.yml
@@ -1,4 +1,4 @@
-- name: Install essential tools
+- name: Install minimal tools
ansible.builtin.package:
name:
- vim
diff --git a/roles/essential/tasks/sudo.yml b/roles/sudo/tasks/main.yml
index e2d4861..e2d4861 100644
--- a/roles/essential/tasks/sudo.yml
+++ b/roles/sudo/tasks/main.yml
diff --git a/roles/essential/files/id_rsa.pub b/roles/users/files/id_rsa.pub
index e2df735..e2df735 100644
--- a/roles/essential/files/id_rsa.pub
+++ b/roles/users/files/id_rsa.pub
diff --git a/roles/essential/tasks/users.yml b/roles/users/tasks/main.yml
index 4749c44..264ad28 100644
--- a/roles/essential/tasks/users.yml
+++ b/roles/users/tasks/main.yml
@@ -22,7 +22,7 @@
- name: Update authorized_keys for Dmitry Ilvokhin
ansible.builtin.copy:
- src: roles/essential/files/id_rsa.pub
+ src: roles/users/files/id_rsa.pub
dest: /home/d/.ssh/authorized_keys
owner: d
group: d