summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerman van Rink2017-10-13 11:44:30 (GMT)
committerHerman van Rink2017-10-13 11:44:47 (GMT)
commitc5358929f168b5a119a3b39558efeae83c9df07f (patch)
tree99b1ef85f00dfdefe6f4fa8213470bf6469f757d
parentcaea3ef3d6e13d2e4b1111025331d93b8512a0a2 (diff)
Issue #2915491: do not test for version, but situation
-rw-r--r--debian/aegir3-hostmaster.postinst2
-rwxr-xr-xscripts/ci-aegir-dev-install-apt-ubuntu-artful.sh5
2 files changed, 2 insertions, 5 deletions
diff --git a/debian/aegir3-hostmaster.postinst b/debian/aegir3-hostmaster.postinst
index 8621aaf..1964e95 100644
--- a/debian/aegir3-hostmaster.postinst
+++ b/debian/aegir3-hostmaster.postinst
@@ -121,7 +121,7 @@ case "$1" in
# 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 [ "$OS_ID" = 'debian' ] && 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
CREATEUSER=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