From 6e457b2be3c75616aca565a70454244510372e1c Mon Sep 17 00:00:00 2001 From: Noah Knegt Date: Mon, 27 Mar 2023 16:32:09 +0200 Subject: [PATCH] Move base to setup role Signed-off-by: Noah Knegt --- base.yml | 7 +++---- roles/{base => setup}/files/ansible/ansible.pub | 0 roles/{base => setup}/files/ansible/ansible_sudoers | 0 roles/{base => setup}/files/noahk/noahk.pub | 0 roles/{base => setup}/files/noahk/noahk_sudoers | 0 roles/{base => setup}/files/ssh_banner.net | 0 roles/{base => setup}/handlers/main.yml | 0 roles/{base => setup}/tasks/main.yml | 0 roles/{base => setup}/tasks/software/repositories.yml | 0 roles/{base => setup}/tasks/system/openssh.yml | 0 roles/{base => setup}/tasks/users/ansible.yml | 0 roles/{base => setup}/tasks/users/noahk.yml | 0 roles/{base => setup}/templates/sshd_config.j2 | 0 roles/{base => setup}/vars/Archlinux.yml | 0 roles/{base => setup}/vars/Debian.yml | 0 roles/{base => setup}/vars/Ubuntu.yml | 0 roles/{base => setup}/vars/main.yml | 0 17 files changed, 3 insertions(+), 4 deletions(-) rename roles/{base => setup}/files/ansible/ansible.pub (100%) rename roles/{base => setup}/files/ansible/ansible_sudoers (100%) rename roles/{base => setup}/files/noahk/noahk.pub (100%) rename roles/{base => setup}/files/noahk/noahk_sudoers (100%) rename roles/{base => setup}/files/ssh_banner.net (100%) rename roles/{base => setup}/handlers/main.yml (100%) rename roles/{base => setup}/tasks/main.yml (100%) rename roles/{base => setup}/tasks/software/repositories.yml (100%) rename roles/{base => setup}/tasks/system/openssh.yml (100%) rename roles/{base => setup}/tasks/users/ansible.yml (100%) rename roles/{base => setup}/tasks/users/noahk.yml (100%) rename roles/{base => setup}/templates/sshd_config.j2 (100%) rename roles/{base => setup}/vars/Archlinux.yml (100%) rename roles/{base => setup}/vars/Debian.yml (100%) rename roles/{base => setup}/vars/Ubuntu.yml (100%) rename roles/{base => setup}/vars/main.yml (100%) diff --git a/base.yml b/base.yml index 512ebcf..d8ffb49 100644 --- a/base.yml +++ b/base.yml @@ -8,11 +8,10 @@ #=================================================================================================== --- -- hosts: ubuntu - remote_user: ansible - become: true +- hosts: all + remote_user: root roles: - - base + - setup # Clean up the system - hosts: ubuntu diff --git a/roles/base/files/ansible/ansible.pub b/roles/setup/files/ansible/ansible.pub similarity index 100% rename from roles/base/files/ansible/ansible.pub rename to roles/setup/files/ansible/ansible.pub diff --git a/roles/base/files/ansible/ansible_sudoers b/roles/setup/files/ansible/ansible_sudoers similarity index 100% rename from roles/base/files/ansible/ansible_sudoers rename to roles/setup/files/ansible/ansible_sudoers diff --git a/roles/base/files/noahk/noahk.pub b/roles/setup/files/noahk/noahk.pub similarity index 100% rename from roles/base/files/noahk/noahk.pub rename to roles/setup/files/noahk/noahk.pub diff --git a/roles/base/files/noahk/noahk_sudoers b/roles/setup/files/noahk/noahk_sudoers similarity index 100% rename from roles/base/files/noahk/noahk_sudoers rename to roles/setup/files/noahk/noahk_sudoers diff --git a/roles/base/files/ssh_banner.net b/roles/setup/files/ssh_banner.net similarity index 100% rename from roles/base/files/ssh_banner.net rename to roles/setup/files/ssh_banner.net diff --git a/roles/base/handlers/main.yml b/roles/setup/handlers/main.yml similarity index 100% rename from roles/base/handlers/main.yml rename to roles/setup/handlers/main.yml diff --git a/roles/base/tasks/main.yml b/roles/setup/tasks/main.yml similarity index 100% rename from roles/base/tasks/main.yml rename to roles/setup/tasks/main.yml diff --git a/roles/base/tasks/software/repositories.yml b/roles/setup/tasks/software/repositories.yml similarity index 100% rename from roles/base/tasks/software/repositories.yml rename to roles/setup/tasks/software/repositories.yml diff --git a/roles/base/tasks/system/openssh.yml b/roles/setup/tasks/system/openssh.yml similarity index 100% rename from roles/base/tasks/system/openssh.yml rename to roles/setup/tasks/system/openssh.yml diff --git a/roles/base/tasks/users/ansible.yml b/roles/setup/tasks/users/ansible.yml similarity index 100% rename from roles/base/tasks/users/ansible.yml rename to roles/setup/tasks/users/ansible.yml diff --git a/roles/base/tasks/users/noahk.yml b/roles/setup/tasks/users/noahk.yml similarity index 100% rename from roles/base/tasks/users/noahk.yml rename to roles/setup/tasks/users/noahk.yml diff --git a/roles/base/templates/sshd_config.j2 b/roles/setup/templates/sshd_config.j2 similarity index 100% rename from roles/base/templates/sshd_config.j2 rename to roles/setup/templates/sshd_config.j2 diff --git a/roles/base/vars/Archlinux.yml b/roles/setup/vars/Archlinux.yml similarity index 100% rename from roles/base/vars/Archlinux.yml rename to roles/setup/vars/Archlinux.yml diff --git a/roles/base/vars/Debian.yml b/roles/setup/vars/Debian.yml similarity index 100% rename from roles/base/vars/Debian.yml rename to roles/setup/vars/Debian.yml diff --git a/roles/base/vars/Ubuntu.yml b/roles/setup/vars/Ubuntu.yml similarity index 100% rename from roles/base/vars/Ubuntu.yml rename to roles/setup/vars/Ubuntu.yml diff --git a/roles/base/vars/main.yml b/roles/setup/vars/main.yml similarity index 100% rename from roles/base/vars/main.yml rename to roles/setup/vars/main.yml