Compare commits

..

No commits in common. "eed8497faa9555bb54224115c5cc354f0cf32694" and "4b9ba22a0e7a1bbe6d05624a9e930cff91168e10" have entirely different histories.

2 changed files with 1 additions and 8 deletions

View File

@ -303,7 +303,7 @@ elif [[ -f "/etc/mysql/debian.cnf" ]] ; then
else else
DEFAULT_MYSQL_CREDENTIALS="" DEFAULT_MYSQL_CREDENTIALS=""
fi fi
DEFAULT_DEBIAN_MYSQL_CREDENTIALS="--defaults-file=/etc/mysql/debian.cnf" DEFAULT_DEBIAN_MYSQL_CREDENTIALS="/etc/mysql/debian.cnf"
[[ -n "$ROUNDCUBE_VERSION" ]] || fatal "Roundcube Version (ROUNDCUBE_VERSION) not present!" [[ -n "$ROUNDCUBE_VERSION" ]] || fatal "Roundcube Version (ROUNDCUBE_VERSION) not present!"
[[ -n "$WEBSITE_NAME" ]] || fatal "Website's name (WEBSITE_NAME) not present!" [[ -n "$WEBSITE_NAME" ]] || fatal "Website's name (WEBSITE_NAME) not present!"

View File

@ -154,13 +154,6 @@ fi
DEFAULT_DB_HOST="localhost" DEFAULT_DB_HOST="localhost"
DEFAULT_DB_NAME="roundcubemail" DEFAULT_DB_NAME="roundcubemail"
DEFAULT_DB_USER="roundcube" DEFAULT_DB_USER="roundcube"
if [[ -f "/usr/local/mysql/sys-maint.cnf" ]] ; then
DEFAULT_MYSQL_CREDENTIALS="--defaults-file=/usr/local/mysql/sys-maint.cnf"
elif [[ -f "/etc/mysql/debian.cnf" ]] ; then
DEFAULT_MYSQL_CREDENTIALS="--defaults-file=/etc/mysql/debian.cnf"
else
DEFAULT_MYSQL_CREDENTIALS=""
fi
DEFAULT_DEBIAN_MYSQL_CREDENTIALS="--defaults-file=/etc/mysql/debian.cnf" DEFAULT_DEBIAN_MYSQL_CREDENTIALS="--defaults-file=/etc/mysql/debian.cnf"
DEFAULT_MYSQL_CREDENTIALS="--defaults-file=/usr/local/mysql/sys-maint.cnf" DEFAULT_MYSQL_CREDENTIALS="--defaults-file=/usr/local/mysql/sys-maint.cnf"