From 08d2914d139426cfccd5c7d06769c5c4a8a89179 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Thu, 27 Sep 2018 02:52:13 +0200
Subject: [PATCH] change default password algorithm (PW_PASSWD_ALGO_PREFIX) to
 '{SHA512-CRYPT}', default (dovecot) password method (PW_DOVECOT_PW_METHOD) to
 'SHA512-CRYPT'.

---
 conf/install_upgrade_roundcube.conf.sample |  8 ++++----
 install_roundcube.sh                       | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/conf/install_upgrade_roundcube.conf.sample b/conf/install_upgrade_roundcube.conf.sample
index 9548c66..88c585d 100644
--- a/conf/install_upgrade_roundcube.conf.sample
+++ b/conf/install_upgrade_roundcube.conf.sample
@@ -320,9 +320,9 @@ POSTFIX_DB_PASSWD=''
 # -    $config['password_algorithm_prefix']
 # -
 # - Example:
-# -    PW_PASSWD_ALGO_PREFIX='{SHA512-CRYPT}'
+# -    PW_PASSWD_ALGO_PREFIX='{CRAM-MD5}'
 # -
-# - Defaults to '{CRAM-MD5}'
+# - Defaults to '{SHA512-CRYPT}'
 # -
 #PW_PASSWD_ALGO_PREFIX=''
 
@@ -339,9 +339,9 @@ POSTFIX_DB_PASSWD=''
 # -    $config['password_dovecotpw_method']
 # -
 # - Example:
-# -    PW_DOVECOT_PW_METHOD='SHA512-CRYPT'
+# -    PW_DOVECOT_PW_METHOD='CRAM-MD5'
 # -
-# - Defaults to 'CRAM-MD5
+# - Defaults to 'SHA512-CRYPT'
 # -
 #PW_DOVECOT_PW_METHOD=
 
diff --git a/install_roundcube.sh b/install_roundcube.sh
index bbdf143..7fc3d62 100755
--- a/install_roundcube.sh
+++ b/install_roundcube.sh
@@ -177,8 +177,8 @@ DEFAULT_APACHE_VHOST_DIR="/usr/local/apache2/conf/vhosts"
 DEFAULT_DB_HOST="localhost"
 DEFAULT_DB_NAME="roundcubemail"
 DEFAULT_DB_USER="roundcube"
-DEFAULT_DEBIAN_MYSQL_CREDENTIALS="/etc/mysql/debian.cnf"
-DEFAULT_MYSQL_CREDENTIALS="/usr/local/mysql/sys-maint.cnf"
+DEFAULT_DEBIAN_MYSQL_CREDENTIALS="--defaults-file=/etc/mysql/debian.cnf"
+DEFAULT_MYSQL_CREDENTIALS="--defaults-file=/usr/local/mysql/sys-maint.cnf"
 
 [[ -n "$ROUNDCUBE_VERSION" ]] || fatal "Roundcube Version (ROUNDCUBE_VERSION) not present!"
 [[ -n "$WEBSITE_NAME" ]] || fatal "Website's name (WEBSITE_NAME) not present!"
@@ -310,7 +310,7 @@ fi
 [[ -n "$PW_MIN_LENGTH" ]] || PW_MIN_LENGTH=10
 [[ -n "$PW_REQUIRE_NONALPHA" ]] || PW_REQUIRE_NONALPHA=true
 [[ -n "$PW_PASSWD_ALGO" ]] || PW_PASSWD_ALGO="dovecot"
-#[[ -n "$PW_PASSWD_ALGO_PREFIX" ]] || PW_PASSWD_ALGO_PREFIX="{CRAM-MD5}"
+[[ -n "$PW_PASSWD_ALGO_PREFIX" ]] || PW_PASSWD_ALGO_PREFIX="{SHA512-CRYPT}"
 
 [[ -n "$POSTFIX_DB_TYPE" ]] || fatal "Plugin password: Database Type for Password Database (POSTFIX_DB_TYPE) not given!"
 if [[ "$POSTFIX_DB_TYPE" != "pgsql" ]] && [[ "$POSTFIX_DB_TYPE" != "mysql" ]]; then
@@ -322,7 +322,7 @@ fi
 [[ -n "$POSTFIX_DB_PASSWD" ]] || fatal "Plugin password: Password for Password Database (POSTFIX_DB_PASSWD) not given!"
 [[ -n "$PW_DB_UPDATE_STRING" ]] || fatal "Plugin password: No SQL query for changing password present!"
 [[ -n "$PW_DOVEADM_PW"  ]] || PW_DOVEADM_PW='/usr/local/dovecot/bin/doveadm pw'
-[[ -n "$PW_DOVECOT_PW_METHOD" ]] || PW_DOVECOT_PW_METHOD='CRAM-MD5'
+[[ -n "$PW_DOVECOT_PW_METHOD" ]] || PW_DOVECOT_PW_METHOD='SHA512-CRYPT'
 
 # - Plugin vacation
 # -
@@ -1598,17 +1598,17 @@ echononl "\tCreate Database '$DB_NAME'"
 if ! $database_exists ; then
 	if [[ "$DB_TYPE" = "mysql" ]]; then
 		echo -n " (MySQL).."
-		mysql -u$_mysql_rootuser -p$_mysql_rootpass -N -s -e \
+		mysql $MYSQL_CREDENTIALS -N -s -e \
          "CREATE DATABASE IF NOT EXISTS $DB_NAME CHARACTER SET utf8 COLLATE utf8_general_ci"
       if [[ $? -ne 0 ]]; then
          _failed=true
       fi
-		mysql -u$_mysql_rootuser -p$_mysql_rootpass -N -s -e \
+		mysql $MYSQL_CREDENTIALS -N -s -e \
          "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS'"
       if [[ $? -ne 0 ]]; then
          _failed=true
       fi
-      mysql -u$_mysql_rootuser -p$_mysql_rootpass -N -s -e "FLUSH PRIVILEGES"
+      mysql $MYSQL_CREDENTIALS -N -s -e "FLUSH PRIVILEGES"
       if [[ $? -ne 0 ]]; then
          _failed=true
       fi