From 17bdfc8fef199e59e34e3bed232f5aa829d39d49 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Sat, 12 Aug 2017 12:51:28 -0400 Subject: [PATCH] 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