install_roundcube.sh,upgrade_roundcube.sh: change some configuration values.
This commit is contained in:
parent
4a2d2a698e
commit
15d4247fb3
@ -157,7 +157,21 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
while IFS='' read -r -d '' _conf_file ; do
|
while IFS='' read -r -d '' _conf_file ; do
|
||||||
source $_conf_file
|
|
||||||
|
WEBSITE_NAME="$(grep -E "^WEBSITE_NAME" "${_conf_file}" 2>/dev/null | cut -d"=" -f2)"
|
||||||
|
|
||||||
|
#Remove leading / trailling double quotes
|
||||||
|
WEBSITE_NAME="${WEBSITE_NAME#"${WEBSITE_NAME%%[!\"]*}"}"
|
||||||
|
WEBSITE_NAME="${WEBSITE_NAME%"${WEBSITE_NAME##*[!\"]}"}"
|
||||||
|
|
||||||
|
#Remove leading / trailling single quotes
|
||||||
|
WEBSITE_NAME="${WEBSITE_NAME#"${WEBSITE_NAME%%[!\']*}"}"
|
||||||
|
WEBSITE_NAME="${WEBSITE_NAME%"${WEBSITE_NAME##*[!\']}"}"
|
||||||
|
|
||||||
|
#Remove leading / trailling space
|
||||||
|
WEBSITE_NAME="${WEBSITE_NAME#"${WEBSITE_NAME%%[![:space:]]*}"}"
|
||||||
|
WEBSITE_NAME="${WEBSITE_NAME%"${WEBSITE_NAME##*[![:space:]]}"}"
|
||||||
|
|
||||||
if [[ -n "$WEBSITE_NAME" ]] ; then
|
if [[ -n "$WEBSITE_NAME" ]] ; then
|
||||||
unsorted_website_arr+=("${WEBSITE_NAME}:$_conf_file")
|
unsorted_website_arr+=("${WEBSITE_NAME}:$_conf_file")
|
||||||
fi
|
fi
|
||||||
@ -1962,19 +1976,19 @@ cat <<EOF >>$WEBSITE_BASEDIR/roundcubemail-${ROUNDCUBE_VERSION}/config/config.in
|
|||||||
// %d - domain (http hostname \$_SERVER['HTTP_HOST'] without the first part)
|
// %d - domain (http hostname \$_SERVER['HTTP_HOST'] without the first part)
|
||||||
// %z - IMAP domain (IMAP hostname without the first part)
|
// %z - IMAP domain (IMAP hostname without the first part)
|
||||||
// For example %n = mail.domain.tld, %t = domain.tld
|
// For example %n = mail.domain.tld, %t = domain.tld
|
||||||
\$config['smtp_server'] = 'localhost';
|
\$config['smtp_server'] = 'tls://$(hostname -f)';
|
||||||
|
|
||||||
// SMTP port (default is 25; use 587 for STARTTLS or 465 for the
|
// SMTP port (default is 25; use 587 for STARTTLS or 465 for the
|
||||||
// deprecated SSL over SMTP (aka SMTPS))
|
// deprecated SSL over SMTP (aka SMTPS))
|
||||||
\$config['smtp_port'] = 25;
|
\$config['smtp_port'] = 587;
|
||||||
|
|
||||||
// SMTP username (if required) if you use %u as the username Roundcube
|
// SMTP username (if required) if you use %u as the username Roundcube
|
||||||
// will use the current username for login
|
// will use the current username for login
|
||||||
\$config['smtp_user'] = '';
|
\$config['smtp_user'] = '%u';
|
||||||
|
|
||||||
// SMTP password (if required) if you use %p as the password Roundcube
|
// SMTP password (if required) if you use %p as the password Roundcube
|
||||||
// will use the current user's password for login
|
// will use the current user's password for login
|
||||||
\$config['smtp_pass'] = '';
|
\$config['smtp_pass'] = '%p';
|
||||||
|
|
||||||
|
|
||||||
// ----------------------------------
|
// ----------------------------------
|
||||||
|
@ -159,7 +159,21 @@ DEFAULT_MYSQL_CREDENTIALS="--defaults-file=/usr/local/mysql/sys-maint.cnf"
|
|||||||
|
|
||||||
|
|
||||||
while IFS='' read -r -d '' _conf_file ; do
|
while IFS='' read -r -d '' _conf_file ; do
|
||||||
source $_conf_file
|
|
||||||
|
WEBSITE_NAME="$(grep -E "^WEBSITE_NAME" "${_conf_file}" 2>/dev/null | cut -d"=" -f2)"
|
||||||
|
|
||||||
|
#Remove leading / trailling double quotes
|
||||||
|
WEBSITE_NAME="${WEBSITE_NAME#"${WEBSITE_NAME%%[!\"]*}"}"
|
||||||
|
WEBSITE_NAME="${WEBSITE_NAME%"${WEBSITE_NAME##*[!\"]}"}"
|
||||||
|
|
||||||
|
#Remove leading / trailling single quotes
|
||||||
|
WEBSITE_NAME="${WEBSITE_NAME#"${WEBSITE_NAME%%[!\']*}"}"
|
||||||
|
WEBSITE_NAME="${WEBSITE_NAME%"${WEBSITE_NAME##*[!\']}"}"
|
||||||
|
|
||||||
|
#Remove leading / trailling space
|
||||||
|
WEBSITE_NAME="${WEBSITE_NAME#"${WEBSITE_NAME%%[![:space:]]*}"}"
|
||||||
|
WEBSITE_NAME="${WEBSITE_NAME%"${WEBSITE_NAME##*[![:space:]]}"}"
|
||||||
|
|
||||||
if [[ -n "$WEBSITE_NAME" ]] ; then
|
if [[ -n "$WEBSITE_NAME" ]] ; then
|
||||||
unsorted_website_arr+=("${WEBSITE_NAME}:$_conf_file")
|
unsorted_website_arr+=("${WEBSITE_NAME}:$_conf_file")
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user