From: Aaron Spettl <redacted>
Date: Fri, 22 Nov 2019 18:03:04 +0000 (+0100)
Subject: smtp_user and smtp_pass are now set by default
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=dd1c9f65def9f2a94c42bd13040de9eb76257d50;p=roundcube-roundcubemail-docker.git

smtp_user and smtp_pass are now set by default
---

diff --git a/apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh
index fa25ac0..63b7a9f 100755
--- a/apache/docker-entrypoint.sh
+++ b/apache/docker-entrypoint.sh
@@ -76,8 +76,6 @@ 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['des_key'] = '${ROUNDCUBEMAIL_DES_KEY}';
     \$config['temp_dir'] = '${ROUNDCUBEMAIL_TEMP_DIR}';
     \$config['plugins'] = ['${ROUNDCUBEMAIL_PLUGINS_PHP}'];
diff --git a/fpm-alpine/docker-entrypoint.sh b/fpm-alpine/docker-entrypoint.sh
index fa25ac0..63b7a9f 100755
--- a/fpm-alpine/docker-entrypoint.sh
+++ b/fpm-alpine/docker-entrypoint.sh
@@ -76,8 +76,6 @@ 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['des_key'] = '${ROUNDCUBEMAIL_DES_KEY}';
     \$config['temp_dir'] = '${ROUNDCUBEMAIL_TEMP_DIR}';
     \$config['plugins'] = ['${ROUNDCUBEMAIL_PLUGINS_PHP}'];
diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh
index fa25ac0..63b7a9f 100755
--- a/fpm/docker-entrypoint.sh
+++ b/fpm/docker-entrypoint.sh
@@ -76,8 +76,6 @@ 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['des_key'] = '${ROUNDCUBEMAIL_DES_KEY}';
     \$config['temp_dir'] = '${ROUNDCUBEMAIL_TEMP_DIR}';
     \$config['plugins'] = ['${ROUNDCUBEMAIL_PLUGINS_PHP}'];