Merge SSH into base role

2020-05-23 10:58:09 +01:00 · 2020-05-23 10:58:09 +01:00 · 7e534e52e1
commit 7e534e52e1
parent 991535ca85
6 changed files with 4 additions and 2 deletions
--- 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:
--- a/ansible/roles/base/files/sshd_config
+++ b/ansible/roles/base/files/sshd_config
--- a/ansible/roles/common/tasks/main.yml
+++ b/ansible/roles/common/tasks/main.yml
@ -3,3 +3,6 @@

 - name: User
  include: user.yml
+
+- name: SSH
+  include: ssh.yml
--- a/ansible/roles/common/tasks/packages.yml
+++ b/ansible/roles/common/tasks/packages.yml
--- a/ansible/roles/base/tasks/ssh.yml
+++ b/ansible/roles/base/tasks/ssh.yml
--- a/ansible/roles/common/tasks/user.yml
+++ b/ansible/roles/common/tasks/user.yml