summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerman van Rink2017-10-13 14:33:33 (GMT)
committerHerman van Rink2017-10-13 14:33:33 (GMT)
commit9747e0fc0758d52cadc72bde5b1001baa0a7e614 (patch)
treecaa07240470541a7c24c1e80267de36a3816f514
parent2a1bb86a3830ad5f297f1ca6209b523dbafb7593 (diff)
parent41a402a8b048ef1757e7a3f204c64fdbcf9c4204 (diff)
Merge branch '2915491-ubuntu-mariadb' into 7.x-3.x
-rw-r--r--debian/aegir3-hostmaster.postinst7
-rwxr-xr-xscripts/ci-aegir-dev-install-apt-ubuntu-artful.sh5
2 files changed, 6 insertions, 6 deletions
diff --git a/debian/aegir3-hostmaster.postinst b/debian/aegir3-hostmaster.postinst
index dc64d1d..1964e95 100644
--- a/debian/aegir3-hostmaster.postinst
+++ b/debian/aegir3-hostmaster.postinst
@@ -115,12 +115,15 @@ case "$1" in
db_get "aegir/db_host"
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.
# Starting from MariaDB 10.1... https://www.drupal.org/node/2770819
# 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
- # MariaDB > 10.1
+ # MariaDB = 10.1
CREATEUSER=1
else
# Mysql & MariaDB < 10.1
diff --git a/scripts/ci-aegir-dev-install-apt-ubuntu-artful.sh b/scripts/ci-aegir-dev-install-apt-ubuntu-artful.sh
index 726c2c7..ee53aee 100755
--- a/scripts/ci-aegir-dev-install-apt-ubuntu-artful.sh
+++ b/scripts/ci-aegir-dev-install-apt-ubuntu-artful.sh
@@ -2,7 +2,7 @@
# Install Aegir debian packages located in the 'build/' directory.
# 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"
sudo apt-get update
@@ -12,9 +12,6 @@ echo "debconf debconf/frontend select Noninteractive" | 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
aegir3-hostmaster aegir/db_password string PASSWORD
aegir3-hostmaster aegir/db_password seen true