Commit 9747e0fc authored by helmo's avatar helmo
Browse files

Merge branch '2915491-ubuntu-mariadb' into 7.x-3.x

parents 2a1bb86a 41a402a8
...@@ -115,12 +115,15 @@ case "$1" in ...@@ -115,12 +115,15 @@ case "$1" in
db_get "aegir/db_host" db_get "aegir/db_host"
AEGIR_DB_HOST="$RET" AEGIR_DB_HOST="$RET"
# Read /etc/os-release to properly handle differences between distributions
OS_ID=$(grep ^ID /etc/os-release | cut -d= -f2)
# Determin if we create a db accoount or ask for it. # Determin if we create a db accoount or ask for it.
# Starting from MariaDB 10.1... https://www.drupal.org/node/2770819 # Starting from MariaDB 10.1... https://www.drupal.org/node/2770819
# TODO: Work with future versions # TODO: Work with future versions
if dpkg -s mariadb-server-10.1 > /dev/null 2>&1 if mysql --database=mysql --execute="show tables;" > /dev/null 2>&1
then then
# MariaDB > 10.1 # MariaDB = 10.1
CREATEUSER=1 CREATEUSER=1
else else
# Mysql & MariaDB < 10.1 # Mysql & MariaDB < 10.1
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Install Aegir debian packages located in the 'build/' directory. # Install Aegir debian packages located in the 'build/' directory.
# These are provided by the GitLab CI build stage. # These are provided by the GitLab CI build stage.
# #
# This script is tuned for Ubuntu 16.04. # This script is tuned for Ubuntu 17.10.
# #
echo "[CI] Updating APT" echo "[CI] Updating APT"
sudo apt-get update sudo apt-get update
...@@ -12,9 +12,6 @@ echo "debconf debconf/frontend select Noninteractive" | debconf-set-selections ...@@ -12,9 +12,6 @@ echo "debconf debconf/frontend select Noninteractive" | debconf-set-selections
#echo "debconf debconf/priority select critical" | debconf-set-selections #echo "debconf debconf/priority select critical" | debconf-set-selections
echo mysql-server-5.7 mysql-server/root_password password PASSWORD | debconf-set-selections
echo mysql-server-5.7 mysql-server/root_password_again password PASSWORD | debconf-set-selections
debconf-set-selections <<EOF debconf-set-selections <<EOF
aegir3-hostmaster aegir/db_password string PASSWORD aegir3-hostmaster aegir/db_password string PASSWORD
aegir3-hostmaster aegir/db_password seen true aegir3-hostmaster aegir/db_password seen true
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment