diff options
| author | binary <me@rgoncalves.se> | 2020-11-19 23:39:47 +0100 |
|---|---|---|
| committer | binary <me@rgoncalves.se> | 2020-11-19 23:39:47 +0100 |
| commit | 5a42c1c27eaf683b6bf51e0d875c5a7fc1ce670c (patch) | |
| tree | 19af5996b37bf8127d933aa7ed9040d902b27802 | |
| parent | 4d4c3509914cacb571901840780d845ee32d0769 (diff) | |
| download | infrastructure-5a42c1c27eaf683b6bf51e0d875c5a7fc1ce670c.tar.gz | |
Refactor ssh in sub roles
| -rw-r--r-- | playbooks/network.yml | 10 | ||||
| -rw-r--r-- | roles/ssh_dns/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/ssh_dns/templates/generate_dns.j2 (renamed from roles/sshd/templates/generate_dns.j2) | 0 |
3 files changed, 9 insertions, 7 deletions
diff --git a/playbooks/network.yml b/playbooks/network.yml index c80aea0..b0c5448 100644 --- a/playbooks/network.yml +++ b/playbooks/network.yml @@ -5,14 +5,14 @@ --- - hosts: localhost - tasks: - - include_role: name=ssh tasks_from=generate_dns.yml + roles: + - { role: ssh_dns } - hosts: servers roles: - - ssh - - wireguard + - { role: sshd } + - { role: wireguard } - hosts: dcontroller roles: - - pf + - { role: pf } diff --git a/roles/ssh_dns/tasks/main.yml b/roles/ssh_dns/tasks/main.yml index 60a21bd..c134d1b 100644 --- a/roles/ssh_dns/tasks/main.yml +++ b/roles/ssh_dns/tasks/main.yml @@ -1,8 +1,10 @@ -# ssh ~~ tasks/local_dns.yml +# ssh dns ~~ roles/ssh_dns/tasks/main.yml +# generate dns for ssh use on workstations + +--- - name: Generate template to localhost template: src: templates/generate_dns.j2 dest: "{{ lookup('env', 'HOME') }}/.ssh/config.d/ssh_dns" - delegate_to: 127.0.0.1 diff --git a/roles/sshd/templates/generate_dns.j2 b/roles/ssh_dns/templates/generate_dns.j2 index 5d58ae9..5d58ae9 100644 --- a/roles/sshd/templates/generate_dns.j2 +++ b/roles/ssh_dns/templates/generate_dns.j2 |