summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerman van Rink2017-10-13 09:20:31 (GMT)
committerHerman van Rink2017-10-13 09:20:31 (GMT)
commitb4b846a88b86090cd3504f2cbd68c5f2407d190e (patch)
tree339a7438ed4ca0569a2ca7ccb0def5b3f0f7791d
parentb2ec92f38e52e8287407b0c145774cc45b962389 (diff)
Issue #2915491: Only use password-less method for Debian
-rw-r--r--debian/aegir3-hostmaster.postinst7
1 files changed, 5 insertions, 2 deletions
diff --git a/debian/aegir3-hostmaster.postinst b/debian/aegir3-hostmaster.postinst
index dc64d1d..909ccd2 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"
+ # Source os-release to properly handle differences between distributions
+ . /etc/os-release
+
# 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 [ $ID = 'debian' ] && dpkg -s mariadb-server-10.1 > /dev/null 2>&1
then
- # MariaDB > 10.1
+ # MariaDB = 10.1
CREATEUSER=1
else
# Mysql & MariaDB < 10.1