From 5b765969f73d56ca14314d6cba733fe4307c5d4b Mon Sep 17 00:00:00 2001
From: Tristan PILAT <tpilat@evolix.fr>
Date: Tue, 28 Mar 2017 19:39:38 +0200
Subject: [PATCH] Adds some oversights

---
 munin/files/crontab                |  1 +
 munin/handlers/main.yml            |  5 +++
 munin/tasks/openbsd.yml            | 10 +++--
 munin/templates/munin-node.conf.j2 | 63 ++++++++++++++++++++++++++++++
 4 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 munin/files/crontab
 create mode 100644 munin/templates/munin-node.conf.j2

diff --git a/munin/files/crontab b/munin/files/crontab
new file mode 100644
index 00000000..73cb0e97
--- /dev/null
+++ b/munin/files/crontab
@@ -0,0 +1 @@
+*/5 * * * * /usr/local/bin/munin-cron > /dev/null
diff --git a/munin/handlers/main.yml b/munin/handlers/main.yml
index 0b7f394e..a0d465a2 100644
--- a/munin/handlers/main.yml
+++ b/munin/handlers/main.yml
@@ -3,3 +3,8 @@
   service:
     name: munin-node
     state: restarted
+
+- name: restart munin_node
+  service:
+    name: munin_node
+    state: restarted
diff --git a/munin/tasks/openbsd.yml b/munin/tasks/openbsd.yml
index 6aca9251..2c2b5711 100644
--- a/munin/tasks/openbsd.yml
+++ b/munin/tasks/openbsd.yml
@@ -29,11 +29,11 @@
   tags:
     - munin
 
-- name: Change hostname in munin-node config
-  replace:
+- name: Set munin-node config
+  template:
+    src: munin-node.conf.j2   
     dest: /etc/munin/munin-node.conf
-    regexp: '#?host_name .*'
-    replace: 'host_name {{ ansible_hostname }}'
+    mode: "0644"
   notify: restart munin_node
   tags:
     - munin
@@ -52,6 +52,7 @@
     src: "/usr/local/libexec/munin/plugins/{{ item }}"
     dest: "/etc/munin/plugins/{{ item }}"
     state: link
+  notify: restart munin_node
   with_items:
     - 'cpu'
     - 'df'
@@ -78,6 +79,7 @@
     src: "/usr/local/libexec/munin/plugins/if_"
     dest: "/etc/munin/plugins/if_{{ item }}"
     state: link
+  notify: restart munin_node
   with_items: "{{ ansible_interfaces }}"
 
 - name: Enable sensors plugin unless VM detected
diff --git a/munin/templates/munin-node.conf.j2 b/munin/templates/munin-node.conf.j2
new file mode 100644
index 00000000..c76fc593
--- /dev/null
+++ b/munin/templates/munin-node.conf.j2
@@ -0,0 +1,63 @@
+#
+# Example config-file for munin-node
+#
+
+log_level 4
+log_file /var/log/munin/munin-node.log
+pid_file /var/run/munin/munin-node.pid
+
+background 1
+setsid 1
+
+user root
+group wheel
+
+# This is the timeout for the whole transaction.
+# Units are in sec. Default is 15 min
+#
+# global_timeout 900
+
+# This is the timeout for each plugin.
+# Units are in sec. Default is 1 min
+#
+# timeout 60
+
+# Regexps for files to ignore
+ignore_file [\#~]$
+ignore_file DEADJOE$
+ignore_file \.bak$
+ignore_file %$
+ignore_file \.dpkg-(tmp|new|old|dist)$
+ignore_file \.rpm(save|new)$
+ignore_file \.pod$
+
+# Set this if the client doesn't report the correct hostname when
+# telnetting to localhost, port 4949
+#
+host_name {{ ansible_fqdn }}
+
+# A list of addresses that are allowed to connect.  This must be a
+# regular expression, since Net::Server does not understand CIDR-style
+# network notation unless the perl module Net::CIDR is installed.  You
+# may repeat the allow line as many times as you'd like
+
+allow ^127\.0\.0\.1$
+allow ^::1$
+
+# If you have installed the Net::CIDR perl module, you can use one or more
+# cidr_allow and cidr_deny address/mask patterns.  A connecting client must
+# match any cidr_allow, and not match any cidr_deny.  Note that a netmask
+# *must* be provided, even if it's /32
+#
+# Example:
+#
+# cidr_allow 127.0.0.1/32
+# cidr_allow 192.0.2.0/24
+# cidr_deny  192.0.2.42/32
+
+# Which address to bind to;
+host 127.0.0.1
+
+# And which port
+port 4949
+