From 7e534e52e11b112df2611e2d245380d436dde6db Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sat, 23 May 2020 10:58:09 +0100 Subject: [PATCH] Merge SSH into base role --- ansible/main.yml | 3 +-- ansible/roles/{ssh => base}/files/sshd_config | 0 ansible/roles/{common => base}/tasks/main.yml | 3 +++ ansible/roles/{common => base}/tasks/packages.yml | 0 ansible/roles/{ssh/tasks/main.yml => base/tasks/ssh.yml} | 0 ansible/roles/{common => base}/tasks/user.yml | 0 6 files changed, 4 insertions(+), 2 deletions(-) rename ansible/roles/{ssh => base}/files/sshd_config (100%) rename ansible/roles/{common => base}/tasks/main.yml (70%) rename ansible/roles/{common => base}/tasks/packages.yml (100%) rename ansible/roles/{ssh/tasks/main.yml => base/tasks/ssh.yml} (100%) rename ansible/roles/{common => base}/tasks/user.yml (100%) diff --git a/ansible/main.yml b/ansible/main.yml index ac3e7d0..b227973 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -1,11 +1,10 @@ - hosts: all roles: - - common + - base - role: geerlingguy.ntp become: true vars: ntp_timezone: Europe/London - - ssh - hosts: casey roles: diff --git a/ansible/roles/ssh/files/sshd_config b/ansible/roles/base/files/sshd_config similarity index 100% rename from ansible/roles/ssh/files/sshd_config rename to ansible/roles/base/files/sshd_config diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/base/tasks/main.yml similarity index 70% rename from ansible/roles/common/tasks/main.yml rename to ansible/roles/base/tasks/main.yml index ba0f5dc..1aceee3 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/base/tasks/main.yml @@ -3,3 +3,6 @@ - name: User include: user.yml + +- name: SSH + include: ssh.yml diff --git a/ansible/roles/common/tasks/packages.yml b/ansible/roles/base/tasks/packages.yml similarity index 100% rename from ansible/roles/common/tasks/packages.yml rename to ansible/roles/base/tasks/packages.yml diff --git a/ansible/roles/ssh/tasks/main.yml b/ansible/roles/base/tasks/ssh.yml similarity index 100% rename from ansible/roles/ssh/tasks/main.yml rename to ansible/roles/base/tasks/ssh.yml diff --git a/ansible/roles/common/tasks/user.yml b/ansible/roles/base/tasks/user.yml similarity index 100% rename from ansible/roles/common/tasks/user.yml rename to ansible/roles/base/tasks/user.yml