From e386e5c544dfeb6af9721531bbf311a0dd0ec854 Mon Sep 17 00:00:00 2001 From: mifi Date: Thu, 12 Feb 2026 19:42:23 -0300 Subject: [PATCH] Adjust a few ENV VAR names --- .env.example | 16 ++++++++-------- plugins/managesieve/config.inc.php | 4 ++-- plugins/password/config.inc.php | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.env.example b/.env.example index 886a51f..e8a44ea 100644 --- a/.env.example +++ b/.env.example @@ -9,10 +9,10 @@ DB_USER=roundcubemail DB_PASSWORD= # Roundcube main (IMAP/SMTP) -ROUNDCUBEMAIL_DEFAULT_HOST=ssl://mail.example.com -ROUNDCUBEMAIL_DEFAULT_PORT=993 -ROUNDCUBEMAIL_SMTP_SERVER=ssl://mail.example.com -ROUNDCUBEMAIL_SMTP_PORT=587 +ROUNDCUBEMAIL_DEFAULT_IMAP_HOST=ssl://mail.example.com +ROUNDCUBEMAIL_DEFAULT_IMAP_PORT=993 +ROUNDCUBEMAIL_DEFAULT_SMTP_SERVER=ssl://mail.example.com +ROUNDCUBEMAIL_DEFAULT_SMTP_PORT=587 ROUNDCUBEMAIL_PLUGINS=acl,additional_message_headers,archive,attachment_reminder,autologon,debug_logger,emoticons,enigma,filesystem_attachments,help,hide_blockquote,http_authentication,identicon,identity_select,jqueryui,krb_authentication,managesieve,markasjunk,new_user_dialog,new_user_identity,newmail_notifier,password,reconnect,show_additional_headers,squirrelmail_usercopy,subscriptions_option,userinfo,vcard_attachments,virtuser_file,virtuser_query,zipdownload ROUNDCUBEMAIL_UPLOAD_MAX_FILESIZE=50M @@ -21,12 +21,12 @@ ROUNDCUBEMAIL_DES_KEY= # Exactly 24 characters; used ROUNDCUBEMAIL_SUPPORT_URL=mailto:admin@example.com # Plugin: managesieve (Sieve server host) -ROUNDCUBEMAIL_MANAGESIEVE_HOST=tls://mail.example.com:4190 +ROUNDCUBEMAIL_PLUGIN_MANAGESIEVE_HOST=tls://mail.example.com:4190 # Plugin: password (Postfix/mailbox DB for password changes) -ROUNDCUBEMAIL_PASSWORD_DB_USER= -ROUNDCUBEMAIL_PASSWORD_DB_PASSWORD= -ROUNDCUBEMAIL_PASSWORD_DB_NAME=postfix +ROUNDCUBEMAIL_PLUGIN_PASSWORD_DB_USER= +ROUNDCUBEMAIL_PLUGIN_PASSWORD_DB_PASSWORD= +ROUNDCUBEMAIL_PLUGIN_PASSWORD_DB_NAME=postfix # Optional: pin image tag (default: latest) # IMAGE_TAG=latest diff --git a/plugins/managesieve/config.inc.php b/plugins/managesieve/config.inc.php index f62cdb7..d6301e0 100644 --- a/plugins/managesieve/config.inc.php +++ b/plugins/managesieve/config.inc.php @@ -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 diff --git a/plugins/password/config.inc.php b/plugins/password/config.inc.php index 5bb470f..947bdcc 100644 --- a/plugins/password/config.inc.php +++ b/plugins/password/config.inc.php @@ -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; }