From 1a1d4265a7cf1745bb5da1409daf9a393885e8a4 Mon Sep 17 00:00:00 2001
From: William Hirigoyen <whirigoyen+git@evolix.fr>
Date: Fri, 21 Jul 2023 16:33:15 +0200
Subject: [PATCH] dovecot: set Munin config in dedicated file

---
 dovecot/files/z-evolinux-dovecot.conf |  6 ++++++
 dovecot/tasks/munin.yml               | 22 ++++------------------
 2 files changed, 10 insertions(+), 18 deletions(-)
 create mode 100644 dovecot/files/z-evolinux-dovecot.conf

diff --git a/dovecot/files/z-evolinux-dovecot.conf b/dovecot/files/z-evolinux-dovecot.conf
new file mode 100644
index 00000000..58052ee1
--- /dev/null
+++ b/dovecot/files/z-evolinux-dovecot.conf
@@ -0,0 +1,6 @@
+[dovecot1]
+user root
+
+[dovecot_stats_*]
+user root
+
diff --git a/dovecot/tasks/munin.yml b/dovecot/tasks/munin.yml
index d223f1e0..7227e991 100644
--- a/dovecot/tasks/munin.yml
+++ b/dovecot/tasks/munin.yml
@@ -44,25 +44,11 @@
         mode: "0755"
       tags: dovecot_stats_
 
-    - name: Sections dovecot1 and dovecot_stats_ are in /etc/munin/plugin-conf.d/zzz-evolinux
-      ansible.builtin.lineinfile:
-        path: /etc/munin/plugin-conf.d/zzz-evolinux
-        regex: '\[{{ item }}\]'
-        line: '[{{ item }}]'
-        create: yes
+    - name: Copy Munin config
+      ansible.builtin.copy:
+        src: z-evolinux-dovecot.conf
+        dest: /etc/munin/plugin-conf.d/z-evolinux-dovecot
         mode: '0644'
-      loop: ['dovecot1', 'dovecot_stats_*']
-      notify: restart munin-node
-
-    - name: User root is set for plugins in /etc/munin/plugin-conf.d/zzz-evolinux
-      ansible.builtin.lineinfile:
-        path: /etc/munin/plugin-conf.d/zzz-evolinux
-        regex: '^[[:blank:]]*user root[[:blank:]]*$'
-        insertafter: '\[{{ item }}\]'
-        line: 'user root'
-        create: yes
-        mode: '0644'
-      loop: ['dovecot1', 'dovecot_stats_*']
       notify: restart munin-node
 
     - name: Enable dovecot1 plugin