Move irssi configuration to irssiconf role

3 files changed, 44 insertions, 34 deletions

diff --git a/roles/irssi/tasks/main.yml b/roles/irssi/tasks/main.yml
index aa19917..a86b376 100644
--- a/roles/irssi/tasks/main.yml
+++ b/roles/irssi/tasks/main.yml
@@ -4,40 +4,8 @@
       - irssi
     state: present
 
-- name: Setup irssi directory for Dmitry Ilvokhin
-  ansible.builtin.file:
-    path: /home/d/.irssi
-    state: directory
-    owner: d
-    group: d
-    mode: u+rw,g-wx,o-rwx
-  tags:
-    - dotfiles
-
-- name: Configure irssi for Dmitry Ilvokhin
-  ansible.builtin.copy:
-    src: misc/dotfiles/irssi/config
-    dest: /home/d/.irssi/config
-    owner: d
-    mode: u+rw,g-rw,o-rw
-  tags:
-    - dotfiles
-
-- name: Setup irssi certs directory for Dmitry Ilvokhin
-  ansible.builtin.file:
-    path: /home/d/.irssi/certs
-    state: directory
-    owner: d
-    group: d
-    mode: u+rw,g-wx,o-rwx
-  tags:
-    - dotfiles
-
 - name: Configure irssi for Dmitry Ilvokhin
-  ansible.builtin.copy:
-    src: misc/dotfiles/irssi/certs/ilvokhin.pem
-    dest: /home/d/.irssi/certs/ilvokhin.pem
-    owner: d
-    mode: u+rw,g-rw,o-rw
+  ansible.builtin.include_role:
+    name: irssiconf
   tags:
     - dotfiles
diff --git a/roles/irssiconf/defaults/main.yml b/roles/irssiconf/defaults/main.yml
new file mode 100644
index 0000000..3923cef
--- /dev/null
+++ b/roles/irssiconf/defaults/main.yml
@@ -0,0 +1,3 @@
+irssiconf_user: d
+irssiconf_group: d
+irssiconf_homedir: /home/{{ irssiconf_user }}
diff --git a/roles/irssiconf/tasks/main.yml b/roles/irssiconf/tasks/main.yml
new file mode 100644
index 0000000..6a07ac5
--- /dev/null
+++ b/roles/irssiconf/tasks/main.yml
@@ -0,0 +1,39 @@
+- name: Setup irssi configuration directory
+  ansible.builtin.file:
+    path: '{{ irssiconf_homedir }}/.irssi'
+    state: directory
+    owner: '{{ irssiconf_user }}'
+    group: '{{ irssiconf_group }}'
+    mode: u+rw,g-wx,o-rwx
+  tags:
+    - dotfiles
+
+- name: Copy irssi configuration
+  ansible.builtin.copy:
+    src: misc/dotfiles/irssi/config
+    dest: '{{ irssiconf_homedir }}/.irssi/config'
+    owner: '{{ irssiconf_user }}'
+    group: '{{ irssiconf_group }}'
+    mode: u+rw,g-rw,o-rw
+  tags:
+    - dotfiles
+
+- name: Setup irssi certs directory
+  ansible.builtin.file:
+    path: '{{ irssiconf_homedir }}/.irssi/certs'
+    state: directory
+    owner: '{{ irssiconf_user }}'
+    group: '{{ irssiconf_group }}'
+    mode: u+rw,g-wx,o-rwx
+  tags:
+    - dotfiles
+
+- name: Copy irssi auth certificates
+  ansible.builtin.copy:
+    src: misc/dotfiles/irssi/certs/ilvokhin.pem
+    dest: '{{ irssiconf_homedir }}/.irssi/certs/ilvokhin.pem'
+    owner: '{{ irssiconf_user }}'
+    group: '{{ irssiconf_group }}'
+    mode: u+rw,g-wx,o-rwx
+  tags:
+    - dotfiles