From 69ed3ecf05cff425a4b3e8c261bc6202a7cd152a Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Sat, 12 Aug 2017 12:35:37 -0400
Subject: [PATCH 1/3] apache: fix log2mail config permissions

---
 apache/tasks/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apache/tasks/main.yml b/apache/tasks/main.yml
index 2c919a41..f503d9b3 100644
--- a/apache/tasks/main.yml
+++ b/apache/tasks/main.yml
@@ -148,8 +148,8 @@
   template:
     src: log2mail-apache.j2
     dest: "/etc/log2mail/config/apache"
-    owner: root
-    group: root
+    owner: log2mail
+    group: adm
     mode: "0644"
     force: no
 

From a4b917152d40400009bd4a56a811dbbad13c5ac8 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Sat, 12 Aug 2017 12:51:15 -0400
Subject: [PATCH 2/3] apache: cleanup munin tasks

---
 apache/defaults/main.yml |  2 ++
 apache/handlers/main.yml |  5 +++++
 apache/tasks/main.yml    |  3 +++
 apache/tasks/munin.yml   | 23 +++++++++++++++++++++++
 4 files changed, 33 insertions(+)
 create mode 100644 apache/tasks/munin.yml

diff --git a/apache/defaults/main.yml b/apache/defaults/main.yml
index 810a0676..d7d5fb25 100644
--- a/apache/defaults/main.yml
+++ b/apache/defaults/main.yml
@@ -13,5 +13,7 @@ apache_phpmyadmin_set: False
 apache_phpmyadmin_suffix: ""
 apache_serverstatus_suffix: ""
 
+apache_munin_include: True
+
 general_alert_email: "root@localhost"
 log2mail_alert_email: Null
diff --git a/apache/handlers/main.yml b/apache/handlers/main.yml
index af4d94d2..09fa8b02 100644
--- a/apache/handlers/main.yml
+++ b/apache/handlers/main.yml
@@ -8,3 +8,8 @@
   service:
     name: apache2
     state: reloaded
+
+- name: reload munin-node
+  service:
+    name: munin-node
+    state: reloaded
diff --git a/apache/tasks/main.yml b/apache/tasks/main.yml
index f503d9b3..3ba54c7e 100644
--- a/apache/tasks/main.yml
+++ b/apache/tasks/main.yml
@@ -169,3 +169,6 @@
 #     dest: /var/www/index.html
 #     regexp: '__SERVERSTATUS_SUFFIX__'
 #     replace: "{{ apache_serverstatus_suffix }}"
+
+- include: munin.yml
+  when: apache_munin_include
diff --git a/apache/tasks/munin.yml b/apache/tasks/munin.yml
new file mode 100644
index 00000000..85f0b386
--- /dev/null
+++ b/apache/tasks/munin.yml
@@ -0,0 +1,23 @@
+---
+
+- name: munin-node and core plugins are installed
+  apt:
+    name: "{{ item }}"
+    state: installed
+  with_items:
+    - munin-node
+    - munin-plugins-core
+
+- name: enable munin plugins
+  file:
+    src: "/usr/share/munin/plugins/{{ item }}"
+    dest: "/etc/munin/plugins/{{ item }}"
+    state: link
+  with_items:
+  - apache_accesses
+  - apache_processes
+  - apache_volume
+  notify: restart munin-node
+  tags:
+  - apache
+  - munin

From 17bdfc8fef199e59e34e3bed232f5aa829d39d49 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Sat, 12 Aug 2017 12:51:28 -0400
Subject: [PATCH 3/3] apache: cleanup log2mail tasks

---
 apache/defaults/main.yml  |  1 +
 apache/tasks/log2mail.yml | 15 +++++++++++++++
 apache/tasks/main.yml     | 16 +++-------------
 3 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 apache/tasks/log2mail.yml

diff --git a/apache/defaults/main.yml b/apache/defaults/main.yml
index d7d5fb25..6b28d670 100644
--- a/apache/defaults/main.yml
+++ b/apache/defaults/main.yml
@@ -13,6 +13,7 @@ apache_phpmyadmin_set: False
 apache_phpmyadmin_suffix: ""
 apache_serverstatus_suffix: ""
 
+apache_log2mail_include: True
 apache_munin_include: True
 
 general_alert_email: "root@localhost"
diff --git a/apache/tasks/log2mail.yml b/apache/tasks/log2mail.yml
new file mode 100644
index 00000000..894ff039
--- /dev/null
+++ b/apache/tasks/log2mail.yml
@@ -0,0 +1,15 @@
+---
+
+- name: log2mail is installed
+  apt:
+    name: log2mail
+    state: present
+
+- name: Add log2mail config for Apache segfaults
+  template:
+    src: log2mail-apache.j2
+    dest: "/etc/log2mail/config/apache"
+    owner: log2mail
+    group: adm
+    mode: "0644"
+    force: no
diff --git a/apache/tasks/main.yml b/apache/tasks/main.yml
index 3ba54c7e..a3ff8cfd 100644
--- a/apache/tasks/main.yml
+++ b/apache/tasks/main.yml
@@ -139,19 +139,6 @@
 - include: phpmyadmin.yml
   when: apache_phpmyadmin_set and _default_index.stat.exists
 
-- name: Check if log2mail is installed
-  apt:
-    name: log2mail
-    state: present
-
-- name: Add log2mail config for Apache segfaults
-  template:
-    src: log2mail-apache.j2
-    dest: "/etc/log2mail/config/apache"
-    owner: log2mail
-    group: adm
-    mode: "0644"
-    force: no
 
 # - block:
 #   - name: generate random string for serverstatus suffix
@@ -170,5 +157,8 @@
 #     regexp: '__SERVERSTATUS_SUFFIX__'
 #     replace: "{{ apache_serverstatus_suffix }}"
 
+- include: log2mail.yml
+  when: apache_log2mail_include
+
 - include: munin.yml
   when: apache_munin_include