From f2613e91aa7fb7f868d27408cc653cfcc626d610 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Fri, 10 Apr 2020 11:35:33 +0200
Subject: [PATCH] evolinux-base: configure cciss-vol-statusd in the proper file

The default file should be used for configuration instead of the init
script.
---
 CHANGELOG.md                                          |  1 +
 evolinux-base/tasks/hardware.yml                      | 11 +++++++++--
 evolinux-base/templates/hardware/cciss-vol-statusd.j2 |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbb1e7b3..d9feb98c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,6 +60,7 @@ The **patch** part changes incrementally at each release.
 * evocheck: cron jobs execute in verbose
 * evolinux-base: use "evolinux_internal_group" for SSH authentication
 * evolinux-base: Don't customize the logcheck recipient by default.
+* evolinux-base: configure cciss-vol-statusd in the proper file
 * evomaintenance: upstream release 0.6.3
 * evomaintenance: Turn on API by default (instead of DB)
 * evomaintenance: install PG dependencies only when needed
diff --git a/evolinux-base/tasks/hardware.yml b/evolinux-base/tasks/hardware.yml
index 6fb88d8a..628cd6d1 100644
--- a/evolinux-base/tasks/hardware.yml
+++ b/evolinux-base/tasks/hardware.yml
@@ -52,17 +52,24 @@
           - ssacli
         state: present
 
-    - name: Configure packages for HP hardware
+    - name: cciss-vol-statusd init script is present
       template:
         src: hardware/cciss-vol-statusd.j2
         dest: /etc/init.d/cciss-vol-statusd
         mode: "0755"
+        
+    - name: Configure cciss-vol-statusd
+      lineinfile:
+        dest: /etc/default/cciss-vol-statusd
+        line: 'MAILTO="{{ raid_alert_email or general_alert_email | mandatory }}"'
+        regexp: 'MAILTO='
+        create: yes
 
     - name: Enable HP hardware in systemd
       service:
         name: cciss-vol-statusd
         enabled: true
-        state: started
+        state: restarted
   when: "'Hewlett-Packard Company Smart Array' in raidmodel.stdout"
 
 - name: MegaRAID SAS package is present
diff --git a/evolinux-base/templates/hardware/cciss-vol-statusd.j2 b/evolinux-base/templates/hardware/cciss-vol-statusd.j2
index c51a1a24..82c2c949 100644
--- a/evolinux-base/templates/hardware/cciss-vol-statusd.j2
+++ b/evolinux-base/templates/hardware/cciss-vol-statusd.j2
@@ -20,7 +20,7 @@ PIDFILE=/var/run/$NAME.pid
 STATUSFILE=/var/run/$NAME.status
 SCRIPTNAME=/etc/init.d/$NAME
 
-MAILTO="{{ raid_alert_email or general_alert_email | mandatory }}"   # Where to report problems
+MAILTO="root"   # Where to report problems
 PERIOD=600    # Seconds between each check    (default 10 minutes)
 REMIND=86400   # Seconds between each reminder (default 2 hours)
 RUN_DAEMON=yes