Merge branch 'master' into 4.0

This commit is contained in:
root 2019-01-12 23:45:07 +02:00
commit cdc0df26bb
34 changed files with 68 additions and 68 deletions

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi

View File

@ -74,10 +74,10 @@ configure_db_mysql() {
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
echo "** Instaling initial MySQL database schemas" echo "** Installing initial MySQL database schemas"
mysql_install_db --user=mysql 2>&1 1>/dev/null mysql_install_db --user=mysql 2>&1 1>/dev/null
else else
echo "**** MySQL data directory is not empty. Using already existsing installation." echo "**** MySQL data directory is not empty. Using already existing installation."
chown -R mysql:mysql "$MYSQL_DATA_DIR" chown -R mysql:mysql "$MYSQL_DATA_DIR"
fi fi