Some minor changes.

This commit is contained in:
Christoph 2018-02-21 13:55:38 +01:00
parent 3aa3542b8f
commit 7a446ef2ea

View File

@ -26,6 +26,7 @@ _required_debian_packages="libevent-dev
libjudy-dev libjudy-dev
libpam0g-dev libpam0g-dev
libpcre3-dev libpcre3-dev
gnutls-dev
default-jdk" default-jdk"
@ -698,8 +699,8 @@ else
echo "## - Starmethode...............: SysVinit Script" >> ${logdir}/main.log echo "## - Starmethode...............: SysVinit Script" >> ${logdir}/main.log
echo "## - MySQL SysyVinit Script....: $MYSQL_SYSV_INIT_SCRIPT" >> ${logdir}/main.log echo "## - MySQL SysyVinit Script....: $MYSQL_SYSV_INIT_SCRIPT" >> ${logdir}/main.log
fi fi
echo "## -" echo "## -" >> ${logdir}/main.log
echo "## - VServer guest system......: $VSERVER_GUEST" echo "## - VServer guest system......: $VSERVER_GUEST" >> ${logdir}/main.log
echo "" >> ${logdir}/main.log echo "" >> ${logdir}/main.log
echo "" >> ${logdir}/main.log echo "" >> ${logdir}/main.log
@ -1044,22 +1045,22 @@ if ! $UPDATE_MYSQL ; then
fi fi
fi fi
if [[ -d /etc/mysql ]]; then # if [[ -d /etc/mysql ]]; then
#
echononl "Sichere/Verschiebe exitierendes Verzeichnis /etc/mysql .." # echononl "Sichere/Verschiebe exitierendes Verzeichnis /etc/mysql .."
echo "" >> ${logdir}/main.log # echo "" >> ${logdir}/main.log
echo "## - Sichere/Verschiebe exitierendes Verzeichnis /etc/mysql" >> ${logdir}/main.log # echo "## - Sichere/Verschiebe exitierendes Verzeichnis /etc/mysql" >> ${logdir}/main.log
echo "## -" >> ${logdir}/main.log # echo "## -" >> ${logdir}/main.log
echo "mv /etc/mysql \"/etc/mysql.${_backup_date}\"" >> ${logdir}/main.log # echo "mv /etc/mysql \"/etc/mysql.${_backup_date}\"" >> ${logdir}/main.log
mv /etc/mysql "/etc/mysql.${_backup_date}" >> ${logdir}/main.log # mv /etc/mysql "/etc/mysql.${_backup_date}" >> ${logdir}/main.log
if [[ $? -eq 0 ]]; then # if [[ $? -eq 0 ]]; then
echo_ok # echo_ok
else # else
echo_failed # echo_failed
fatal "Kann Verzeichnis '/etc/mysql' nicht sichern!" # fatal "Kann Verzeichnis '/etc/mysql' nicht sichern!"
fi # fi
#
fi # if [[ -d /etc/mysql ]]; then # fi # if [[ -d /etc/mysql ]]; then
echononl "Update index files of the debian repositories" echononl "Update index files of the debian repositories"
@ -1341,6 +1342,7 @@ else
fatal Kann LOG Verzeichnis \"${MYSQL_LOG_DIR}\" nicht erstellen.. fatal Kann LOG Verzeichnis \"${MYSQL_LOG_DIR}\" nicht erstellen..
fi fi
echononl "Setze Besitzer \"${MYSQL_USER}:${MYSQL_GROUP}\" für LOG Verzeichnis" echononl "Setze Besitzer \"${MYSQL_USER}:${MYSQL_GROUP}\" für LOG Verzeichnis"
echo "" >> ${logdir}/main.log echo "" >> ${logdir}/main.log
echo "## - Setze Besitzer \"${MYSQL_USER}:${MYSQL_GROUP}\" für LOG Verzeichnis" >> ${logdir}/main.log echo "## - Setze Besitzer \"${MYSQL_USER}:${MYSQL_GROUP}\" für LOG Verzeichnis" >> ${logdir}/main.log
@ -1452,11 +1454,6 @@ if [ -d ${MYSQL_INSTALL_DIR} ];then
fi fi
#cd $MYSQL_SRC_BASE_DIR
#echo "" >> ${logdir}/main.log
#echo "cd $MYSQL_SRC_BASE_DIR" >> ${logdir}/main.log
echononl "Entpacke $distfile ..." echononl "Entpacke $distfile ..."
echo "" >> ${logdir}/main.log echo "" >> ${logdir}/main.log
echo "## - Entpacke $distfile" >> ${logdir}/main.log echo "## - Entpacke $distfile" >> ${logdir}/main.log
@ -1484,6 +1481,11 @@ else
fatal "Kann nicht in das Sourceverzeicnis '${MYSQL_SRC_DIR}' wechseln!" fatal "Kann nicht in das Sourceverzeicnis '${MYSQL_SRC_DIR}' wechseln!"
fi fi
# - Erstelle Optionen für 'cmake' # - Erstelle Optionen für 'cmake'
# - # -
# - Note: # - Note:
@ -1494,6 +1496,9 @@ fi
# - # -
# - We change the default to empty ("") with -D INSTALL_SECURE_FILE_PRIVDIR="" option # - We change the default to empty ("") with -D INSTALL_SECURE_FILE_PRIVDIR="" option
# - # -
# - To get a complete list of available options, type
# - shell> cmake . -LH | tee ~/mysql_cmake_options.txt
# -
echononl "Erstelle Optionen für 'cmake'" echononl "Erstelle Optionen für 'cmake'"
echo "" >> ${logdir}/main.log echo "" >> ${logdir}/main.log
echo "## - Erstelle Optionen für 'cmake'" >> ${logdir}/main.log echo "## - Erstelle Optionen für 'cmake'" >> ${logdir}/main.log
@ -1933,6 +1938,7 @@ else
fi fi
fi fi
echononl "Setze Besitzer/Gruppe für das Datenbankverzeichnis.." echononl "Setze Besitzer/Gruppe für das Datenbankverzeichnis.."
echo "" >> ${logdir}/main.log echo "" >> ${logdir}/main.log
echo "## - Setze Besitzer/Gruppe für das Datenbankverzeichnis" >> ${logdir}/main.log echo "## - Setze Besitzer/Gruppe für das Datenbankverzeichnis" >> ${logdir}/main.log
@ -1956,32 +1962,6 @@ else
fi fi
#echononl "Sichere Konfigurationsdatei 'my.cnf'.."
#if [ -f ${MYSQL_INSTALL_DIR}/my.cnf ]; then
# echo "" >> ${logdir}/main.log
# echo "## - Sichere Konfigurationsdatei 'my.cnf'" >> ${logdir}/main.log
# echo "## -" >> ${logdir}/main.log
# echo "mv ${MYSQL_INSTALL_DIR}/my.cnf ${MYSQL_INSTALL_DIR}/my.cnf.ORIG" >> ${logdir}/main.log
# mv ${MYSQL_INSTALL_DIR}/my.cnf ${MYSQL_INSTALL_DIR}/my.cnf.ORIG
# if [ "$?" = "0" ]; then
# echo_ok
# else
# echo_failed
# error Konnte Konfigurationsdatei ${MYSQL_INSTALL_DIR}/my.cnf nicht sichern..
#
# echononl "continue anyway [yes/no]: "
# read OK
# OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')"
# while [[ "$OK" != "yes" ]] && [[ "$OK" != "no" ]] ; do
# echononl "Wrong entry! - repeat [yes/nno]: "
# read OK
# done
# [[ $OK = "yes" ]] || fatal "Abbruch durch User"
# fi
#else
# echo_skipped
#fi
_new_cnf_needed=false _new_cnf_needed=false
if $UPDATE_MYSQL ; then if $UPDATE_MYSQL ; then
@ -2033,10 +2013,10 @@ if $UPDATE_MYSQL ; then
if [[ "$MYSQL_MAJOR_VERSION" -gt 5 ]] \ if [[ "$MYSQL_MAJOR_VERSION" -gt 5 ]] \
|| ( [[ "$MYSQL_MAJOR_VERSION" -eq 5 ]] && [[ "$MYSQL_MINOR_VERSION" -ge 7 ]] ) ; then || ( [[ "$MYSQL_MAJOR_VERSION" -eq 5 ]] && [[ "$MYSQL_MINOR_VERSION" -ge 7 ]] ) ; then
proof_var="thread_concurrency" proof_var="thread_concurrency"
echononl "Deaktivire '${proof_var} .." echononl "Deaktiviere '${proof_var} .."
if grep -q -E "^\s*${proof_var}.*" "$MY_CNF_FILE" 2> /dev/null ; then if grep -q -E "^\s*${proof_var}.*" "$MY_CNF_FILE" 2> /dev/null ; then
echo "" >> ${logdir}/main.log echo "" >> ${logdir}/main.log
echo "## - Deaktivire '${proof_var} .." >> ${logdir}/main.log echo "## - Deaktiviere '${proof_var} .." >> ${logdir}/main.log
echo "## -" >> ${logdir}/main.log echo "## -" >> ${logdir}/main.log
echo "perl -i -n -p -e \"s/^(\s*)(${proof_var}.*)/#\1\2/\" \"$MY_CNF_FILE\"" >> ${logdir}/main.log echo "perl -i -n -p -e \"s/^(\s*)(${proof_var}.*)/#\1\2/\" \"$MY_CNF_FILE\"" >> ${logdir}/main.log
perl -i -n -p -e "s/^(\s*)(${proof_var}.*)/#\1\2/" "$MY_CNF_FILE" >> ${logdir}/main.log 2>&1 perl -i -n -p -e "s/^(\s*)(${proof_var}.*)/#\1\2/" "$MY_CNF_FILE" >> ${logdir}/main.log 2>&1
@ -2051,10 +2031,10 @@ if $UPDATE_MYSQL ; then
fi fi
proof_var="innodb_additional_mem_pool_size" proof_var="innodb_additional_mem_pool_size"
echononl "Deaktivire '${proof_var} .." echononl "Deaktiviere '${proof_var} .."
if grep -q -E "^\s*${proof_var}.*" "$MY_CNF_FILE" 2> /dev/null ; then if grep -q -E "^\s*${proof_var}.*" "$MY_CNF_FILE" 2> /dev/null ; then
echo "" >> ${logdir}/main.log echo "" >> ${logdir}/main.log
echo "## - Deaktivire '${proof_var} .." >> ${logdir}/main.log echo "## - Deaktiviere '${proof_var} .." >> ${logdir}/main.log
echo "## -" >> ${logdir}/main.log echo "## -" >> ${logdir}/main.log
echo "perl -i -n -p -e \"s/^(\s*)(${proof_var}.*)/#\1\2/\" \"$MY_CNF_FILE\"" >> ${logdir}/main.log echo "perl -i -n -p -e \"s/^(\s*)(${proof_var}.*)/#\1\2/\" \"$MY_CNF_FILE\"" >> ${logdir}/main.log
perl -i -n -p -e "s/^(\s*)(${proof_var}.*)/#\1\2/" "$MY_CNF_FILE" >> ${logdir}/main.log 2>&1 perl -i -n -p -e "s/^(\s*)(${proof_var}.*)/#\1\2/" "$MY_CNF_FILE" >> ${logdir}/main.log 2>&1
@ -3730,6 +3710,55 @@ EOF
fi fi
if [[ ! -d "/etc/mysql" ]]; then
echononl "Erstelle Verzeichnis '/etc/mysql' .."
echo "" >> ${logdir}/main.log
echo "## - Erstelle Verzeichnis '/etc/mysql' .." >> ${logdir}/main.log
echo "## -" >> ${logdir}/main.log
echo "mkdir \"/etc/mysql\"" >> ${logdir}/main.log
mkdir "/etc/mysql" >> ${logdir}/main.log 2>&1
if [ "$?" = "0" ]; then
echo_ok
else
echo_failed
error "Konnte Verzeichnis '/etc/mysql' nicht erstellen"
fi
else
if [[ -f "/etc/mysql/my.cnf" ]]; then
echononl "Backup Symlink/Datei '/etc/mysql/my.cnf' .."
echo "" >> ${logdir}/main.log
echo "## - Backup Symlink/Datei '/etc/mysql/my.cnf' .." >> ${logdir}/main.log
echo "## -" >> ${logdir}/main.log
echo "## -" >> ${logdir}/main.log
echo "mv \"/etc/mysql/my.cnf\" \"/etc/mysql/my.cnf.${_backup_date}\"" >> ${logdir}/main.log
mv "/etc/mysql/my.cnf" "/etc/mysql/my.cnf.${_backup_date}" >> ${logdir}/main.log 2>&1
if [ "$?" = "0" ]; then
echo_ok
else
echo_failed
error "Konnte Symlink/Datei '/etc/mysql/my.cnf' nicht sichern."
fi
fi
fi
echononl "Erstelle Symlink /etc/mysql/my.cnf --> ${MYSQL_INSTALL_DIR}/etc/my.cnf"
echo "" >> ${logdir}/main.log
echo "## - Erstelle Symlink /etc/mysql/my.cnf --> ${MYSQL_INSTALL_DIR}/etc/my.cnf" >> ${logdir}/main.log
echo "## -" >> ${logdir}/main.log
echo "ln -s \"$(dirname \"${MYSQL_INSTALL_DIR}\")/mysql/etc/my.cnf\" \"/etc/mysql/\"" >> ${logdir}/main.log
ln -s "$(dirname "${MYSQL_INSTALL_DIR}")/mysql/etc/my.cnf" "/etc/mysql/my.cnf" >> ${logdir}/main.log 2>&1
if [ "$?" = "0" ]; then
echo_ok
else
echo_failed
error "Konnte Symlink /etc/mysql/my.cnf --> ${MYSQL_INSTALL_DIR}/etc/my.cnf nicht erstellen."
fi
echononl "Kopiere 'stopwords_utf8_iso8859-15.txt' -> ${MYSQL_INSTALL_DIR}.." echononl "Kopiere 'stopwords_utf8_iso8859-15.txt' -> ${MYSQL_INSTALL_DIR}.."
if [ -f "${MYSQL_SRC_BASE_DIR}/stopwords_utf8_iso8859-15.txt" ];then if [ -f "${MYSQL_SRC_BASE_DIR}/stopwords_utf8_iso8859-15.txt" ];then
echo "" >> ${logdir}/main.log echo "" >> ${logdir}/main.log
@ -3768,7 +3797,6 @@ else
fi fi
if $INSTALL_SYSTEMD_SERVICE ; then if $INSTALL_SYSTEMD_SERVICE ; then
echononl "Kopiere Service File nach '/etc/systemd/system'.." echononl "Kopiere Service File nach '/etc/systemd/system'.."
@ -4052,21 +4080,69 @@ if ! $UPDATE_MYSQL ; then
[[ $OK = "yes" ]] || fatal "Abbruch durch User" [[ $OK = "yes" ]] || fatal "Abbruch durch User"
fi fi
## - Drop database test
## -
if [[ -d "${MYSQL_DATA_DIR}/test" ]]; then
echononl "Delete database 'test'.."
echo "" >> ${logdir}/main.log
echo "## - Delete database 'test'.." >> ${logdir}/main.log
echo "## - " >> ${logdir}/main.log
echo "${MYSQL_INSTALL_DIR}/bin/mysql -uroot mysql -N -s -e \"DROP DATABASE test\"" >> ${logdir}/main.log
${MYSQL_INSTALL_DIR}/bin/mysql -uroot mysql -N -s -e "DROP DATABASE test" >> ${logdir}/main.log 2>&1
if [[ $? -eq 0 ]]; then
echo_ok
else
echo_failed
error "Deleting database 'test' failed!"
echononl "continue anyway [yes/no]: "
read OK
OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')"
while [[ "$OK" != "yes" ]] && [[ "$OK" != "no" ]] ; do
echononl "Wrong entry! - repeat [yes/nno]: "
read OK
done
[[ $OK = "yes" ]] || fatal "Abbruch durch User"
fi
echononl "Delete rows concerning database 'test' from table 'mysql.db'.."
echo "" >> ${logdir}/main.log
echo "## - Delete rows concerning database 'test' from table 'mysql.db'.." >> ${logdir}/main.log
echo "## - " >> ${logdir}/main.log
echo "${MYSQL_INSTALL_DIR}/bin/mysql -uroot mysql -N -s -e \"DELETE FROM db WHERE Db LIKE 'test%'\"" >> ${logdir}/main.log
${MYSQL_INSTALL_DIR}/bin/mysql -uroot mysql -N -s -e "DELETE FROM db WHERE Db LIKE 'test%'" >> ${logdir}/main.log 2>&1
if [[ $? -eq 0 ]]; then
echo_ok
else
echo_failed
error "Deleting rows concerning database 'test' from table 'mysql.db' failed!"
echononl "continue anyway [yes/no]: "
read OK
OK="$(echo "$OK" | tr '[:upper:]' '[:lower:]')"
while [[ "$OK" != "yes" ]] && [[ "$OK" != "no" ]] ; do
echononl "Wrong entry! - repeat [yes/nno]: "
read OK
done
[[ $OK = "yes" ]] || fatal "Abbruch durch User"
fi
fi
## - Set root password ## - Set root password
## - ## -
echononl "Setze root Passwort für den MySQL Zugang" echononl "Setze root Passwort für den MySQL Zugang"
echo "" >> ${logdir}/main.log echo "" >> ${logdir}/main.log
echo "## - Setze root Passwort für den MySQL Zugang" >> ${logdir}/main.log echo "## - Setze root Passwort für den MySQL Zugang" >> ${logdir}/main.log
echo "## -" >> ${logdir}/main.log echo "## -" >> ${logdir}/main.log
echo "${MYSQL_INSTALL_DIR}/bin/mysql -uroot mysql -N -s -e \"UPDATE user set authentication_string = password('$MYSQL_ROOT_PW')\"" >> ${logdir}/main.log echo "${MYSQL_INSTALL_DIR}/bin/mysql -uroot mysql -N -s -e \"UPDATE user SET authentication_string = password('$MYSQL_ROOT_PW')\" WHERE User = 'root'" >> ${logdir}/main.log
${MYSQL_INSTALL_DIR}/bin/mysql -uroot mysql -N -s -e "UPDATE user set authentication_string = password('$MYSQL_ROOT_PW')" \ ${MYSQL_INSTALL_DIR}/bin/mysql -uroot mysql -N -s -e "UPDATE user SET authentication_string = password('$MYSQL_ROOT_PW') WHERE User = 'root'" \
>> ${logdir}/main.log 2>&1 >> ${logdir}/main.log 2>&1
if [ "$?" = "0" ]; then if [ "$?" = "0" ]; then
echo_ok echo_ok
else else
echo_failed echo_failed
error Konnte MySQL root Zugang fü den MySQL Server nicht setzen.. error Konnte root Passwort für den MySQL Server nicht setzen..
echononl "continue anyway [yes/no]: " echononl "continue anyway [yes/no]: "
read OK read OK
@ -4330,7 +4406,7 @@ fi
sys_maint_file="$(dirname $MYSQL_INSTALL_DIR)/mysql/sys-maint.cnf" sys_maint_file="$(dirname $MYSQL_INSTALL_DIR)/mysql/sys-maint.cnf"
echononl "Erstelle Logrotate Definitionsdatei /etc/logrotate.d/mysql.." echononl "Erstelle Logrotate Definitionsdatei '/etc/logrotate.d/mysql'.."
echo "" >> ${logdir}/main.log echo "" >> ${logdir}/main.log
echo "## - Erstelle Logrotate Definitionsdatei /etc/logrotate.d/mysql" >> ${logdir}/main.log echo "## - Erstelle Logrotate Definitionsdatei /etc/logrotate.d/mysql" >> ${logdir}/main.log
echo "## -" >> ${logdir}/main.log echo "## -" >> ${logdir}/main.log
@ -4386,6 +4462,8 @@ else
error Konnte Logrotate Definitionsdatei \"/etc/logrotate.d/mysql\" nicht erstellen.. error Konnte Logrotate Definitionsdatei \"/etc/logrotate.d/mysql\" nicht erstellen..
fi fi
echo echo
echononl "Reenable crontab for user root .." echononl "Reenable crontab for user root .."
if $_crontab_found ; then if $_crontab_found ; then