From 7197ff9140477ab7ac462a23da6a91f055a93e02 Mon Sep 17 00:00:00 2001 From: Noah Knegt Date: Mon, 27 Mar 2023 16:30:52 +0200 Subject: [PATCH 1/3] Move hosts to yaml file Signed-off-by: Noah Knegt --- inventory/hosts.yml | 41 +++++++++++++++++++++++++++++++++++++++++ inventory/servers.ini | 6 ------ 2 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 inventory/hosts.yml delete mode 100644 inventory/servers.ini diff --git a/inventory/hosts.yml b/inventory/hosts.yml new file mode 100644 index 0000000..34a8c77 --- /dev/null +++ b/inventory/hosts.yml @@ -0,0 +1,41 @@ +# =================================================================================================== +# ? ABOUT +# @author : Noah Knegt +# @email : personal@noahknegt.com +# @repo : https://git.noahknegt.com/noah.knegt/ansible-automations +# @createdOn : 27-03-2023 +# @description : This file contains the hosts for ansible. +# =================================================================================================== + +--- +vpses: + hosts: + vps1-contabo: + ansible_host: 161.97.139.67 + ansible_port: 4422 + +pis: + hosts: + pi1: + ansible_host: 192.168.90.2 + pi2: + ansible_host: 192.168.90.3 + +equinox-servers: + hosts: + apollo: + ansible_host: 23.97.157.206 + ansible_port: 2004 + +all: + children: + home: + children: + pis: + datacenter: + children: + vpses: + equinox: + children: + equinox-servers: + diff --git a/inventory/servers.ini b/inventory/servers.ini deleted file mode 100644 index ae12b02..0000000 --- a/inventory/servers.ini +++ /dev/null @@ -1,6 +0,0 @@ -[private] -vps1 ansible_host=vps.noahknegt.com:4422 -rpi1 ansible_host=192.168.90.2 - -[equinox] -apollo ansible_host=apollo.svequinox.nl:2004 -- 2.49.1 From 6e457b2be3c75616aca565a70454244510372e1c Mon Sep 17 00:00:00 2001 From: Noah Knegt Date: Mon, 27 Mar 2023 16:32:09 +0200 Subject: [PATCH 2/3] 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 -- 2.49.1 From d34be9fbf0778abbbe9ae299fdb990ef28ad0c4b Mon Sep 17 00:00:00 2001 From: Noah Knegt Date: Mon, 27 Mar 2023 16:39:03 +0200 Subject: [PATCH 3/3] Set the correct roles Signed-off-by: Noah Knegt --- ansible.cfg | 2 +- base.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible.cfg b/ansible.cfg index fa6cc7e..8c1335f 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,2 +1,2 @@ [defaults] -inventory = inventory/servers.ini +inventory = inventory/hosts.yml diff --git a/base.yml b/base.yml index d8ffb49..d6660bc 100644 --- a/base.yml +++ b/base.yml @@ -8,13 +8,13 @@ #=================================================================================================== --- -- hosts: all +- hosts: datacenter remote_user: root roles: - setup # Clean up the system -- hosts: ubuntu +- hosts: datacenter remote_user: ansible become: true tasks: -- 2.49.1