install/mysql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

install_mysql.sh: fix error in creating logrotation file if parallel installation.

Browse Source
This commit is contained in:
Christoph 2019-01-17 12:19:40 +01:00
parent 91c661bb40
commit 6545eddf0b
1 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
install_mysql.sh
View File

@ -490,6 +490,13 @@ do
fi
done
_mysql_log=${MYSQL_LOG_DIR}/mysql.log
_mysql_error_log=${MYSQL_LOG_DIR}/mysql.err
_mysql_slow_query_log=${MYSQL_LOG_DIR}/slow_query.log
if [[ "$MYSQL_DISTRIBUTION" = "MariaDB" ]]; then
mariadb_groonga_log=${MYSQL_LOG_DIR}/groonga.log
fi
if $PARALLEL_INSTALLATION ; then
declare -i _port=3307
@ -781,7 +788,11 @@ clear
echo -e "\033[21G\033[32mStarte Installation mit folgenden Parametern:\033[m"
echo ""
if ! $UPDATE_MYSQL ; then
if $PARALLEL_INSTALLATION ; then
echo -e "-- \033[33m\033[1mParallelinstallation\033[m --"
else
echo -e "-- \033[33m\033[1mNeusistallation\033[m --"
fi
else
echo -e "-- \033[33m\033[1mUpdate\033[m (Ersetzen einer vorhandenen Installation) --"
echo ""
@ -894,7 +905,11 @@ touch ${logdir}/main.log
echo -e "## - Starte Installation mit folgenden Parametern:" >> ${logdir}/main.log
echo "## -" >> ${logdir}/main.log
if ! $UPDATE_MYSQL ; then
if $PARALLEL_INSTALLATION ; then
echo "## - Parallelinstallation" >> ${logdir}/main.log
else
echo "## - Neusistallation" >> ${logdir}/main.log
fi
else
echo "## - Update (Ersetzen einer vorhandenen Installation)" >> ${logdir}/main.log
echo "## -" >> ${logdir}/main.log
@ -947,7 +962,8 @@ echo "" >> ${logdir}/main.log
echo "" >> ${logdir}/main.log
echo "UPDATE_MYSQL=$UPDATE_MYSQL" >> ${logdir}/main.log
if ! $UPDATE_MYSQL ; then
echo "PARALLEL_INSTALLATION=$PARALLEL_INSTALLATION"
if $UPDATE_MYSQL ; then
echo "CURRENT_VERSION=$CURRENT_VERSION" >> ${logdir}/main.log
echo "MYSQL_CUR_DATA_DIR=$MYSQL_CUR_DATA_DIR" >> ${logdir}/main.log
echo "MYSQL_CUR_INSTALL_DIR=$MYSQL_CUR_INSTALL_DIR" >> ${logdir}/main.log
@ -986,6 +1002,14 @@ echo "MYSQL_SYSV_INIT_SCRIPT=$MYSQL_SYSV_INIT_SCRIPT" >> ${logdir}/main.log
echo "VSERVER_GUEST=$VSERVER_GUEST" >> ${logdir}/main.log
echo "_mysql_log=$_mysql_log" >> ${logdir}/main.log
echo "_mysql_error_log=$_mysql_error_log" >> ${logdir}/main.log
echo "_mysql_slow_query_log=$_mysql_slow_query_log" >> ${logdir}/main.log
if [[ "$MYSQL_DISTRIBUTION" = "MariaDB" ]]; then
echo "mariadb_groonga_log=$mariadb_groonga_log" >> ${logdir}/main.log
fi
if ! $PARALLEL_INSTALLATION ; then
MYSQL_INIT_SCRIPT=""
@ -1802,12 +1826,6 @@ echo "mkdir -p $MYSQL_LOG_DIR" >> ${logdir}/main.log
mkdir -p $MYSQL_LOG_DIR >> ${logdir}/main.log 2>&1
if [ "$?" = "0" ]; then
echo_ok
_mysql_log=${MYSQL_LOG_DIR}/mysql.log
_mysql_error_log=${MYSQL_LOG_DIR}/mysql.err
_mysql_slow_query_log=${MYSQL_LOG_DIR}/slow_query.log
if [[ "$MYSQL_DISTRIBUTION" = "MariaDB" ]]; then
mariadb_groonga_log=${MYSQL_LOG_DIR}/groonga.log
fi
else
echo_failed
fatal Kann LOG Verzeichnis \"${MYSQL_LOG_DIR}\" nicht erstellen..
@ -5614,10 +5632,15 @@ fi
if $PARALLEL_INSTALLATION ; then
_logrotate_file=/etc/logrotate.d/${MYSQL_DISTRIBUTION,,}-$MYSQL_VERSION
sys_maint_file="${MYSQL_INSTALL_DIR}/sys-maint.cnf"
_mysql_binary="${MYSQL_INSTALL_DIR}/bin/mysql"
_mysqladmin_binary="${MYSQL_INSTALL_DIR}/bin/mysqladmin"
else
_logrotate_file=/etc/logrotate.d/mysql
fi
sys_maint_file="$(dirname $MYSQL_INSTALL_DIR)/mysql/sys-maint.cnf"
_mysql_binary="$(dirname $MYSQL_INSTALL_DIR)/mysql/bin/mysql"
_mysqladmin_binary="$(dirname $MYSQL_INSTALL_DIR)/mysql/bin/mysqladmin"
fi
echononl "Erstelle Logrotate Definitionsdatei '$_logrotate_file'.."
echo "" >> ${logdir}/main.log
echo "## - Erstelle Logrotate Definitionsdatei $_logrotate_file" >> ${logdir}/main.log
@ -5634,8 +5657,8 @@ $_mysql_slow_query_log
compress
sharedscripts
postrotate
MYSQL=\"$(dirname $MYSQL_INSTALL_DIR)/mysql/bin/mysql --defaults-file=$sys_maint_file\"
MYADMIN=\"$(dirname $MYSQL_INSTALL_DIR)/mysql/bin/mysqladmin --defaults-file=$sys_maint_file\"
MYSQL=\"$_mysql_binary --defaults-file=$sys_maint_file\"
MYADMIN=\"$_mysqladmin_binary --defaults-file=$sys_maint_file\"
if [ -z \"\$(\$MYADMIN ping 2>/dev/null)\" ]; then
echo "Warning: no mysqld running or missing sys-maint user?"
else
@ -5657,8 +5680,8 @@ $_mysql_slow_query_log
compress
sharedscripts
postrotate
MYSQL="$(dirname $MYSQL_INSTALL_DIR)/mysql/bin/mysql --defaults-file=$sys_maint_file"
MYADMIN="$(dirname $MYSQL_INSTALL_DIR)/mysql/bin/mysqladmin --defaults-file=$sys_maint_file"
MYSQL="$_mysql_binary --defaults-file=$sys_maint_file"
MYADMIN="$_mysqladmin_binary --defaults-file=$sys_maint_file"
if [ -z "\$(\$MYADMIN ping 2>/dev/null)" ]; then
echo "Warning: no mysqld running or missing sys-maint user?"
else