Commit b4b846a8 authored by helmo's avatar helmo

Issue #2915491: Only use password-less method for Debian

parent b2ec92f3
......@@ -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
......
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