diff --git a/faafo/contrib/install.sh b/faafo/contrib/install.sh index b763407..2951daa 100755 --- a/faafo/contrib/install.sh +++ b/faafo/contrib/install.sh @@ -84,11 +84,11 @@ if [[ -e /etc/os-release ]]; then if [[ $INSTALL_DATABASE -eq 1 ]]; then if [[ $ID = 'ubuntu' || $ID = 'debian' ]]; then - sudo DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server python3-mysqldb + sudo DEBIAN_FRONTEND=noninteractive apt-get install -y mariadb-server python3-mysqldb # HSFD changes for Ubuntu 18.04 - sudo sed -i -e "/bind-address/d" /etc/mysql/mysql.conf.d/mysqld.cnf - #sudo sed -i -e "/bind-address/d" /etc/mysql/my.cnf - sudo service mysql restart + #sudo sed -i -e "/bind-address/d" /etc/mysql/mysql.conf.d/mysqld.cnf + ##sudo sed -i -e "/bind-address/d" /etc/mysql/my.cnf + sudo systemctl restart mariadb elif [[ $ID = 'fedora' ]]; then # fedora currently not tested nor supported sudo dnf install -y mariadb-server python3-mysql @@ -99,7 +99,7 @@ if [[ -e /etc/os-release ]]; then echo "error: distribution $ID not supported" exit 1 fi - sudo mysqladmin password password + sudo mariadb-admin password password sudo mysql -uroot -ppassword mysql -e "CREATE DATABASE IF NOT EXISTS faafo; GRANT ALL PRIVILEGES ON faafo.* TO 'faafo'@'%' IDENTIFIED BY 'password';" URL_DATABASE='mysql://root:password@localhost/faafo' fi