Skip to content

Commit 4c9530f

Browse files
committed
Merge branch 'remove/mailhog' of https://github.com/mrrobot47/site-wp-command into mrrobot47-remove/mailhog
2 parents c1b4271 + d31b263 commit 4c9530f

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

src/Site_WP_Command.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ public function info( $args ) {
254254
$info = [
255255
[ 'Site', $prefix . $this->site['name'] ],
256256
[ 'Access phpMyAdmin', $prefix . $this->site['name'] . '/ee-admin/pma/' ],
257-
[ 'Access mailhog', $prefix . $this->site['name'] . '/ee-admin/mailhog/' ],
258257
[ 'Site Title', $this->site['title'] ],
259258
[ 'DB Root Password', $this->db['root_pass'] ],
260259
[ 'DB Name', $this->db['name'] ],

src/Site_WP_Docker.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public function generate_docker_compose_yml( array $filters = [] ) {
158158

159159
$base[] = $php;
160160
$base[] = $nginx;
161-
$base[] = $mailhog;
161+
//$base[] = $mailhog;
162162
$base[] = $phpmyadmin;
163163

164164
if ( in_array( 'wpredis', $filters, true ) ) {

templates/config/php-fpm/php.ini.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ upload_max_filesize = 100M
44
post_max_size = 100M
55

66
[mail function]
7-
sendmail_path = /usr/sbin/sendmail -S mailhog:1025
7+
sendmail_path = /usr/sbin/sendmail -t -i

0 commit comments

Comments
 (0)