refactor!(php-fpm): drop support for MailHog

Automattic · May 6, 2024 · fcdad4d · fcdad4d
1 parent 8a35647
commit fcdad4d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git 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
@@ -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
diff --git 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() {