Better defaults for smtp settings, fixes #24

diff --git a/php-apache/docker-entrypoint.sh b/php-apache/docker-entrypoint.sh
index 685317e363ba6c12503a941161146a1ba03e42ca..59ef659ecba8dd5be21ce9398afef3d53e244340 100755 (executable)
--- a/php-apache/docker-entrypoint.sh
+++ b/php-apache/docker-entrypoint.sh
@@ -67,6 +67,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
     \$config['default_port'] = '${ROUNDCUBEMAIL_DEFAULT_PORT}';
     \$config['smtp_server'] = '${ROUNDCUBEMAIL_SMTP_SERVER}';
     \$config['smtp_port'] = '${ROUNDCUBEMAIL_SMTP_PORT}';
+    \$config['smtp_user'] = '%u';
+    \$config['smtp_pass'] = '%p';
     \$config['temp_dir'] = '${ROUNDCUBEMAIL_TEMP_DIR}';
     \$config['plugins'] = ['${ROUNDCUBEMAIL_PLUGINS_PHP}'];
     \$config['zipdownload_selection'] = true;

diff --git a/php-fpm/docker-entrypoint.sh b/php-fpm/docker-entrypoint.sh
index 21d27ae383e50d1283987b50f336627fa1f5ee8e..5bc637860d44e254254b1ba67c2703edebb41651 100755 (executable)
--- a/php-fpm/docker-entrypoint.sh
+++ b/php-fpm/docker-entrypoint.sh
@@ -67,6 +67,8 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
     \$config['default_port'] = '${ROUNDCUBEMAIL_DEFAULT_PORT}';
     \$config['smtp_server'] = '${ROUNDCUBEMAIL_SMTP_SERVER}';
     \$config['smtp_port'] = '${ROUNDCUBEMAIL_SMTP_PORT}';
+    \$config['smtp_user'] = '%u';
+    \$config['smtp_pass'] = '%p';
     \$config['temp_dir'] = '${ROUNDCUBEMAIL_TEMP_DIR}';
     \$config['plugins'] = ['${ROUNDCUBEMAIL_PLUGINS_PHP}'];
     \$config['zipdownload_selection'] = true;