From a4c39165458e05d1c79a2bebfe95d588ced3a77a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Wed, 16 Jan 2019 15:20:03 +0100 Subject: [PATCH] Fix issue #17 - `MYSQL_ADMIN` is now a variable because some installation doesn't have `mysqladmin` user. - `/usr/bin/mytop` or `/usr/local/bin/mytop` are checked. --- evocheck.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/evocheck.sh b/evocheck.sh index 0d58635..3f51691 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -320,7 +320,13 @@ if [ -e /etc/debian_version ]; then # Verification mytop + Munin si MySQL if [ "$IS_MYSQLUTILS" = 1 ]; then - is_installed mysql-server && ( grep -q mysqladmin /root/.my.cnf && test -x /usr/bin/mytop && grep -q debian-sys-maint /root/.mytop || echo 'IS_MYSQLUTILS FAILED!' ) + MYSQL_ADMIN=${MYSQL_ADMIN:-mysqladmin} + if is_installed mysql-server; then + # You can configure MYSQL_ADMIN in evocheck.cf + grep -q "$MYSQL_ADMIN" /root/.my.cnf || echo 'IS_MYSQLUTILS FAILED!' + ( test -x /usr/bin/mytop || test -x /usr/local/bin/mytop ) || echo 'IS_MYSQLUTILS FAILED!' + grep -q debian-sys-maint /root/.mytop || echo 'IS_MYSQLUTILS FAILED!' + fi fi # Verification de la configuration du raid soft (mdadm)