diff --git a/php-fpm/rootfs-php/cli/php.ini b/php-fpm/rootfs-php/cli/php.ini index 65ed4b42..aafd85f0 100644 --- a/php-fpm/rootfs-php/cli/php.ini +++ b/php-fpm/rootfs-php/cli/php.ini @@ -17,7 +17,6 @@ realpath_cache_size = "800K" realpath_cache_ttl = "86400" disable_functions = sendmail_path=/bin/true -;sendmail_path = "/usr/local/bin/mhsendmail --smtp-addr='sendmailhog:1025'" [Date] date.timezone = "UTC" diff --git a/php-fpm/rootfs-php/fpm/php.ini b/php-fpm/rootfs-php/fpm/php.ini index 65ed4b42..aafd85f0 100644 --- a/php-fpm/rootfs-php/fpm/php.ini +++ b/php-fpm/rootfs-php/fpm/php.ini @@ -17,7 +17,6 @@ realpath_cache_size = "800K" realpath_cache_ttl = "86400" disable_functions = sendmail_path=/bin/true -;sendmail_path = "/usr/local/bin/mhsendmail --smtp-addr='sendmailhog:1025'" [Date] date.timezone = "UTC" diff --git a/php-fpm/rootfs-php/mods-available/mailhog.ini b/php-fpm/rootfs-php/mods-available/mailhog.ini deleted file mode 100644 index 5b180042..00000000 --- a/php-fpm/rootfs-php/mods-available/mailhog.ini +++ /dev/null @@ -1,2 +0,0 @@ -; priority=99 -sendmail_path = "/usr/bin/msmtp --host=mailhog --port=1025 -t --auto-from" diff --git a/php-fpm/rootfs/usr/local/bin/run.sh b/php-fpm/rootfs/usr/local/bin/run.sh index 80f79ef9..6ce33055 100755 --- a/php-fpm/rootfs/usr/local/bin/run.sh +++ b/php-fpm/rootfs/usr/local/bin/run.sh @@ -8,12 +8,10 @@ else phpdismod -s fpm xdebug fi -if [ -n "${LANDO_INFO}" ] && [ 'null' != "$(echo "${LANDO_INFO}" | jq -r .mailhog)" ]; then - phpenmod mailhog -elif [ -n "${LANDO_INFO}" ] && [ 'null' != "$(echo "${LANDO_INFO}" | jq -r .mailpit)" ]; then +if [ -n "${LANDO_INFO}" ] && [ 'null' != "$(echo "${LANDO_INFO}" | jq -r .mailpit)" ]; then phpenmod mailpit else - phpdismod mailhog mailpit + phpdismod mailpit fi cleanup() {