Compare commits

...

3 Commits

View File

@ -6695,13 +6695,10 @@ EOF
passdb_default_password_scheme = ${default_pass_scheme} passdb_default_password_scheme = ${default_pass_scheme}
sql_driver = mysql sql_driver = mysql
mysql localhost { mysql /run/mysqld/mysqld.sock {
user = ${dbuser}
parameters { password = ${dbpassword}
user=${dbuser} dbname = ${dbname}
password=${dbpassword}
dbname=${dbname}
}
} }
EOF EOF
if [ "$?" = 0 ]; then if [ "$?" = 0 ]; then
@ -9211,7 +9208,7 @@ userdb sql {
EOF EOF
if grep -qE "^\s*userdb sql\s+{" "${_conf_file}"; then if grep -qE "^\s*userdb sql\s+{" "${_conf_file}"; then
replace_code_block "userdb" "${NEW_BLOCK}" "${_conf_file}" || _failed=true replace_code_block "userdb sql" "${NEW_BLOCK}" "${_conf_file}" || _failed=true
else else
cat <<EOF >> "${_conf_file}" || _failed=true cat <<EOF >> "${_conf_file}" || _failed=true
@ -9644,7 +9641,7 @@ quota "User quota" {
# 'quota_storage_extra' to get the final value (in this mailbox or # 'quota_storage_extra' to get the final value (in this mailbox or
# namespace). This is reported as the STORAGE limit in IMAP GETQUOTA # namespace). This is reported as the STORAGE limit in IMAP GETQUOTA
# commands. Using 0 as the value means the same as unlimited. # commands. Using 0 as the value means the same as unlimited.
quota_storage_size = 1G #quota_storage_size = 0
} }
EOF EOF
if grep -qE "^\s*quota \"User quota\"\s+{" "${_conf_file}"; then if grep -qE "^\s*quota \"User quota\"\s+{" "${_conf_file}"; then