jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 21:26:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

mariadb: do not change password on addon update

Browse Source
This commit is contained in:
Peter Vicman 2019-01-29 10:39:03 +01:00
parent bc7508e5c8
commit 78cd04bf93
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/addons/service/mariadb/changelog.txt
View File

@ -1,3 +1,6 @@
102
- do not change password on addon update
101 101
- update MariaDB to 10.3.12 - update MariaDB to 10.3.12
removed optimizer_search_depth from config file to speed it up removed optimizer_search_depth from config file to speed it up

2
packages/addons/service/mariadb/package.mk
View File

@ -3,7 +3,7 @@
PKG_NAME="mariadb" PKG_NAME="mariadb"
PKG_VERSION="10.3.12" PKG_VERSION="10.3.12"
PKG_REV="101" PKG_REV="102"
PKG_SHA256="f7449a34c25e0455928d7983dae83fd2069fe1f16c4c5f4aeed9ed9d3f081ff6" PKG_SHA256="f7449a34c25e0455928d7983dae83fd2069fe1f16c4c5f4aeed9ed9d3f081ff6"
PKG_LICENSE="GPL2" PKG_LICENSE="GPL2"
PKG_SITE="https://mariadb.org" PKG_SITE="https://mariadb.org"

31
packages/addons/service/mariadb/source/bin/mariadb.start
View File

@ -16,20 +16,6 @@ if [ -n "$PID" ]; then
exit 0 exit 0
fi fi
# check for first run and generate passwords
DEF_XML="$ADDON_DIR/settings-default.xml"
CUR_XML="$ADDON_HOME/settings.xml"
if grep -q "@MYSQL_ROOT_PASS@" $DEF_XML; then
MYSQL_ROOT_PASS="$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 8)"
MYSQL_KODI_PASS="$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 8)"
sed -i "s|@MYSQL_ROOT_PASS@|$MYSQL_ROOT_PASS|g" $DEF_XML
sed -i "s|@MYSQL_KODI_PASS@|$MYSQL_KODI_PASS|g" $DEF_XML
cp $DEF_XML $CUR_XML
fi
# copy config file # copy config file
if [ ! -f $ADDON_HOME/my.cnf ]; then if [ ! -f $ADDON_HOME/my.cnf ]; then
cp $ADDON_DIR/config/my.cnf $ADDON_HOME cp $ADDON_DIR/config/my.cnf $ADDON_HOME
@ -41,19 +27,28 @@ if [ ! -d "$ADDON_HOME/data/mysql" ]; then
$ADDON_DIR/bin/mysql_install_db --basedir=$ADDON_DIR --datadir=$ADDON_HOME/data $ADDON_DIR/bin/mysql_install_db --basedir=$ADDON_DIR --datadir=$ADDON_HOME/data
fi fi
# check for first run and generate passwords
if grep -q "@MYSQL_ROOT_PASS@" $ADDON_HOME/settings.xml; then
MYSQL_ROOT_PASS="$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 8)"
MYSQL_KODI_PASS="$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 8)"
sed -e "s|@MYSQL_ROOT_PASS@|$MYSQL_ROOT_PASS|g" \
-e "s|@MYSQL_KODI_PASS@|$MYSQL_KODI_PASS|g" \
-i $ADDON_HOME/settings.xml
fi
# init script to create user kodi and change passwords # init script to create user kodi and change passwords
init_file="" init_file=""
if [[ ! -f $ADDON_DIR/set_mysql_passwords.sql ]] || [[ $CUR_XML -nt $ADDON_DIR/set_mysql_passwords.sql ]]; then if [[ ! -f $ADDON_HOME/set_mysql_passwords.sql ]] || [[ $ADDON_HOME/settings.xml -nt $ADDON_HOME/set_mysql_passwords.sql ]]; then
cat << SQL_DATA > $ADDON_DIR/set_mysql_passwords.sql cat << SQL_DATA > $ADDON_HOME/set_mysql_passwords.sql
SET PASSWORD FOR 'root'@'localhost'=PASSWORD('$MYSQL_ROOT_PASS'); SET PASSWORD FOR 'root'@'localhost'=PASSWORD('$MYSQL_ROOT_PASS');
CREATE USER IF NOT EXISTS 'kodi'; CREATE USER IF NOT EXISTS 'kodi';
SET PASSWORD FOR 'kodi'=PASSWORD('$MYSQL_KODI_PASS'); SET PASSWORD FOR 'kodi'=PASSWORD('$MYSQL_KODI_PASS');
GRANT ALL ON *.* TO 'kodi'; GRANT ALL ON *.* TO 'kodi';
flush privileges; flush privileges;
SQL_DATA SQL_DATA
init_file="--init-file=$ADDON_DIR/set_mysql_passwords.sql" init_file="--init-file=$ADDON_HOME/set_mysql_passwords.sql"
fi fi
echo "Starting mysqld" echo "Starting mysqld"