Adjust a few ENV VAR names
This commit is contained in:
@@ -10,8 +10,8 @@
|
||||
// function, with 4190 as a fallback.
|
||||
// Note: Add tls:// prefix to enable explicit STARTTLS
|
||||
// or add ssl:// prefix to enable implicit SSL.
|
||||
// From env ROUNDCUBEMAIL_MANAGESIEVE_PLUGIN_HOST (e.g. tls://mail.example.com:4190)
|
||||
$managesieveHost = getenv('ROUNDCUBEMAIL_MANAGESIEVE_PLUGIN_HOST');
|
||||
// From env ROUNDCUBEMAIL_PLUGIN_MANAGESIEVE_HOST (e.g. tls://mail.example.com:4190)
|
||||
$managesieveHost = getenv('ROUNDCUBEMAIL_PLUGIN_MANAGESIEVE_HOST');
|
||||
$config['managesieve_host'] = ($managesieveHost !== false && $managesieveHost !== '') ? $managesieveHost : 'localhost';
|
||||
|
||||
// authentication method. Can be CRAM-MD5, DIGEST-MD5, PLAIN, LOGIN, EXTERNAL
|
||||
|
||||
@@ -118,9 +118,9 @@ $config['password_http_client'] = [];
|
||||
// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
|
||||
// %z - IMAP domain (IMAP hostname without the first part)
|
||||
// Built from env: ROUNDCUBEMAIL_PASSWORD_DB_USER, ROUNDCUBEMAIL_PASSWORD_DB_PASSWORD, ROUNDCUBEMAIL_PASSWORD_DB_NAME
|
||||
$pwDbUser = getenv('ROUNDCUBEMAIL_PASSWORD_PLUGIN_DB_USER');
|
||||
$pwDbPass = getenv('ROUNDCUBEMAIL_PASSWORD_PLUGIN_DB_PASSWORD');
|
||||
$pwDbName = getenv('ROUNDCUBEMAIL_PASSWORD_PLUGIN_DB_NAME') ?: 'postfix';
|
||||
$pwDbUser = getenv('ROUNDCUBEMAIL_PLUGIN_PASSWORD_DB_USER');
|
||||
$pwDbPass = getenv('ROUNDCUBEMAIL_PLUGIN_PASSWORD_DB_PASSWORD');
|
||||
$pwDbName = getenv('ROUNDCUBEMAIL_PLUGIN_PASSWORD_DB_NAME') ?: 'postfix';
|
||||
if ($pwDbUser !== false && $pwDbUser !== '' && $pwDbPass !== false) {
|
||||
$config['password_db_dsn'] = 'mysql://' . $pwDbUser . ':' . rawurlencode($pwDbPass) . '@unix(/var/run/mysqld/mysqld.sock)/' . $pwDbName;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user