From 873d51d388b3c61f926d025b8ce3ee83e845a89f Mon Sep 17 00:00:00 2001 From: Dmitry Ilvokhin Date: Sat, 9 Aug 2025 10:27:36 +0100 Subject: Move mutt configuration to muttrc role --- roles/dotfiles/tasks/main.yml | 10 ++++++---- roles/mutt/tasks/main.yml | 8 ++------ roles/muttrc/defaults/main.yml | 3 +++ roles/muttrc/tasks/main.yml | 9 +++++++++ 4 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 roles/muttrc/defaults/main.yml create mode 100644 roles/muttrc/tasks/main.yml diff --git a/roles/dotfiles/tasks/main.yml b/roles/dotfiles/tasks/main.yml index 8dbb20f..6761bd6 100644 --- a/roles/dotfiles/tasks/main.yml +++ b/roles/dotfiles/tasks/main.yml @@ -117,10 +117,12 @@ failed_when: false register: has_mutt - - name: Copy muttrc to home directory - ansible.builtin.copy: - src: misc/dotfiles/muttrc - dest: '{{ homedir }}/.muttrc' + - ansible.builtin.include_role: + name: muttrc + vars: + muttrc_user: '{{ user }}' + muttrc_group: '{{ group }}' + muttrc_homedir: '{{ homedir }}' when: has_mutt.rc == 0 - name: Configure go if installed diff --git a/roles/mutt/tasks/main.yml b/roles/mutt/tasks/main.yml index 6cabca1..91dbe90 100644 --- a/roles/mutt/tasks/main.yml +++ b/roles/mutt/tasks/main.yml @@ -5,11 +5,7 @@ state: present - name: Configure mutt for Dmitry Ilvokhin - ansible.builtin.copy: - src: misc/dotfiles/muttrc - dest: /home/d/.muttrc - owner: d - group: d - mode: u+rw,g+r,o+r + ansible.builtin.include_role: + name: muttrc tags: - dotfiles diff --git a/roles/muttrc/defaults/main.yml b/roles/muttrc/defaults/main.yml new file mode 100644 index 0000000..fd50f86 --- /dev/null +++ b/roles/muttrc/defaults/main.yml @@ -0,0 +1,3 @@ +muttrc_user: d +muttrc_group: d +muttrc_homedir: /home/{{ muttrc_user }} diff --git a/roles/muttrc/tasks/main.yml b/roles/muttrc/tasks/main.yml new file mode 100644 index 0000000..55ac10a --- /dev/null +++ b/roles/muttrc/tasks/main.yml @@ -0,0 +1,9 @@ +- name: Copy muttrc to home directory + ansible.builtin.copy: + src: misc/dotfiles/muttrc + dest: '{{ muttrc_homedir }}/.muttrc' + owner: '{{ muttrc_user }}' + group: '{{ muttrc_group }}' + mode: u+rw,g+r,o+r + tags: + - dotfiles -- cgit v1.2.3-70-g09d2