4 files changed, 23 insertions, 16 deletions
diff --git a/roles/dotfiles/tasks/main.yml b/roles/dotfiles/tasks/main.yml
index a047d15..30a06ed 100644
--- a/roles/dotfiles/tasks/main.yml
+++ b/roles/dotfiles/tasks/main.yml
@@ -83,13 +83,12 @@
       failed_when: false
       register: has_git
 
-    - name: Copy git config files to home directory
-      ansible.builtin.copy:
-        src: misc/dotfiles/{{ item }}
-        dest: '{{ homedir }}/.{{ item }}'
-      loop:
-        - gitconfig
-        - gitignore
+    - ansible.builtin.include_role:
+        name: gitconfig
+      vars:
+        gitconfig_user: '{{ user }}'
+        gitconfig_group: '{{ group }}'
+        gitconfig_homedir: '{{ homedir }}'
       when: has_git.rc == 0
 
 - name: Configure gdb if installed
diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml
index 1a465a7..cf9ed16 100644
--- a/roles/git/tasks/main.yml
+++ b/roles/git/tasks/main.yml
@@ -5,14 +5,7 @@
     state: present
 
 - name: Configure git for Dmitry Ilvokhin
-  ansible.builtin.copy:
-    src: misc/dotfiles/{{ item }}
-    dest: /home/d/.{{ item }}
-    owner: d
-    group: d
-    mode: u+rw,g+r,o+r
-  loop:
-    - gitignore
-    - gitconfig
+  ansible.builtin.include_role:
+    name: gitconfig
   tags:
     - dotfiles
diff --git a/roles/gitconfig/defaults/main.yml b/roles/gitconfig/defaults/main.yml
new file mode 100644
index 0000000..b828ce7
--- /dev/null
+++ b/roles/gitconfig/defaults/main.yml
@@ -0,0 +1,3 @@
+gitconfig_user: d
+gitconfig_group: d
+gitconfig_homedir: /home/{{ gitconfig_user }}
diff --git a/roles/gitconfig/tasks/main.yml b/roles/gitconfig/tasks/main.yml
new file mode 100644
index 0000000..82f1095
--- /dev/null
+++ b/roles/gitconfig/tasks/main.yml
@@ -0,0 +1,12 @@
+- name: Copy git config files to home directory
+  ansible.builtin.copy:
+    src: misc/dotfiles/{{ item }}
+    dest: '{{ gitconfig_homedir }}/.{{ item }}'
+    owner: '{{ gitconfig_user }}'
+    group: '{{ gitconfig_group }}'
+    mode: u+rw,g+r,o+r
+  loop:
+    - gitconfig
+    - gitignore
+  tags:
+    - dotfiles