From 9c092c21b67f5990be0adbcc28f8b851cfcabdf3 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 3 Mar 2021 17:25:39 +0100 Subject: [PATCH] We don't need no mysql password --- lib/witness.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/witness.sh b/lib/witness.sh index b458844..7ffb626 100644 --- a/lib/witness.sh +++ b/lib/witness.sh @@ -37,9 +37,8 @@ set_witness_files () { create_witness_file "/etc/systemd/system/witnessfile.service" file # Database - local mysqlpwd=$(RUN_INSIDE_LXC cat /etc/yunohost/mysql) - RUN_INSIDE_LXC mysqladmin --user=root --password="$mysqlpwd" --wait status > /dev/null 2>&1 - echo "CREATE DATABASE witnessdb" | RUN_INSIDE_LXC mysql --user=root --password="$mysqlpwd" --wait > /dev/null 2>&1 + RUN_INSIDE_LXC mysqladmin --wait status > /dev/null 2>&1 + echo "CREATE DATABASE witnessdb" | RUN_INSIDE_LXC mysql --wait > /dev/null 2>&1 } check_witness_files () { @@ -82,8 +81,7 @@ check_witness_files () { check_file_exist "/etc/systemd/system/witnessfile.service" # Database - local mysqlpwd=$(RUN_INSIDE_LXC cat /etc/yunohost/mysql) - if ! RUN_INSIDE_LXC mysqlshow --user=root --password="$mysqlpwd" witnessdb > /dev/null 2>&1 + if ! RUN_INSIDE_LXC mysqlshow witnessdb > /dev/null 2>&1 then log_error "The database witnessdb is missing ! Something gone wrong !" SET_RESULT "failure" witness