Move ssh configuration to sshconfig role

5 files changed, 44 insertions, 43 deletions

diff --git a/roles/dotfiles/tasks/main.yml b/roles/dotfiles/tasks/main.yml
index ce851f2..a047d15 100644
--- a/roles/dotfiles/tasks/main.yml
+++ b/roles/dotfiles/tasks/main.yml
@@ -65,32 +65,15 @@
       failed_when: false
       register: has_ssh
 
-    - name: Setup ssh directory
-      ansible.builtin.file:
-        path: '{{ homedir }}/.ssh'
-        state: directory
-        owner: '{{ user }}'
-        mode: u+rw,g-rw,o-rw
-      when: has_ssh.rc == 0
-
-    - name: Template ssh config to home directory
-      ansible.builtin.template:
-        src: misc/dotfiles/ssh/config.j2
-        dest: '{{ homedir }}/.ssh/config'
-        owner: '{{ user }}'
-        mode: u+rw,g-rw,o-rw
+    - ansible.builtin.include_role:
+        name: sshconfig
+      vars:
+        sshconfig_user: '{{ user }}'
+        sshconfig_group: '{{ group }}'
+        sshconfig_homedir: '{{ homedir }}'
+        sshconfig_jumphost: '{{ jumphost }}'
       when: has_ssh.rc == 0
 
-    - name: Copy ssh rc to home directory
-      ansible.builtin.copy:
-        src: misc/dotfiles/ssh/rc
-        dest: '{{ homedir }}/.ssh/rc'
-        owner: '{{ user }}'
-        mode: u+rwx,g-rw,o-rw
-      when:
-        - has_ssh.rc == 0
-        - jumphost
-
 - name: Configure git if installed
   tags: git
   block:
diff --git a/roles/ssh/defaults/main.yml b/roles/ssh/defaults/main.yml
deleted file mode 100644
index 7ea2a66..0000000
--- a/roles/ssh/defaults/main.yml
+++ /dev/null
@@ -1 +0,0 @@
-jumphost: false
diff --git a/roles/ssh/tasks/main.yml b/roles/ssh/tasks/main.yml
index 1ac5c99..fb1e8ca 100644
--- a/roles/ssh/tasks/main.yml
+++ b/roles/ssh/tasks/main.yml
@@ -19,23 +19,7 @@
     - dotfiles
 
 - name: Configure ssh for Dmitry Ilvokhin
-  ansible.builtin.template:
-    src: misc/dotfiles/ssh/config.j2
-    dest: /home/d/.ssh/config
-    owner: d
-    mode: u+rw,g-rw,o-rw
-  when:
-    - jumphost
-  tags:
-    - dotfiles
-
-- name: Add ssh rc for Dmitry Ilvokhin
-  ansible.builtin.copy:
-    src: misc/dotfiles/ssh/rc
-    dest: /home/d/.ssh/rc
-    owner: d
-    mode: u+rwx,g-rw,o-rw
-  when:
-    - jumphost
+  ansible.builtin.include_role:
+    name: sshconfig
   tags:
     - dotfiles
diff --git a/roles/sshconfig/defaults/main.yml b/roles/sshconfig/defaults/main.yml
new file mode 100644
index 0000000..823f290
--- /dev/null
+++ b/roles/sshconfig/defaults/main.yml
@@ -0,0 +1,4 @@
+sshconfig_user: d
+sshconfig_group: d
+sshconfig_homedir: /home/{{ sshconfig_user }}
+sshconfig_jumphost: '{{ jumphost }}'
diff --git a/roles/sshconfig/tasks/main.yml b/roles/sshconfig/tasks/main.yml
new file mode 100644
index 0000000..a4ced5e
--- /dev/null
+++ b/roles/sshconfig/tasks/main.yml
@@ -0,0 +1,31 @@
+- name: Setup ssh directory
+  ansible.builtin.file:
+    path: '{{ sshconfig_homedir }}/.ssh'
+    state: directory
+    owner: '{{ sshconfig_user }}'
+    group: '{{ sshconfig_group }}'
+    mode: u+rw,g-rw,o-rw
+  tags:
+    - dotfiles
+
+- name: Template ssh config to home directory
+  ansible.builtin.template:
+    src: misc/dotfiles/ssh/config.j2
+    dest: '{{ sshconfig_homedir }}/.ssh/config'
+    owner: '{{ sshconfig_user }}'
+    group: '{{ sshconfig_group }}'
+    mode: u+rw,g-rw,o-rw
+  tags:
+    - dotfiles
+
+- name: Copy ssh rc to home directory
+  ansible.builtin.copy:
+    src: misc/dotfiles/ssh/rc
+    dest: '{{ sshconfig_homedir }}/.ssh/rc'
+    owner: '{{ sshconfig_user }}'
+    group: '{{ sshconfig_group }}'
+    mode: u+rwx,g-rw,o-rw
+  when:
+    - sshconfig_jumphost
+  tags:
+    - dotfiles