Merge branch 'develop' into update/param-syntax

EasyEngine · Aug 6, 2018 · 7978c6c · 7978c6c
2 parents 0ae3abf + 3972130
commit 7978c6c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/Site_WP_Command.php b/src/Site_WP_Command.php
@@ -258,7 +258,6 @@ public function info( $args ) {
 		$info   = [
 			[ 'Site', $prefix . $this->site['name'] ],
 			[ 'Access phpMyAdmin', $prefix . $this->site['name'] . '/ee-admin/pma/' ],
-			[ 'Access mailhog', $prefix . $this->site['name'] . '/ee-admin/mailhog/' ],
 			[ 'Site Title', $this->site['title'] ],
 			[ 'DB Root Password', $this->db['root_pass'] ],
 			[ 'DB Name', $this->db['name'] ],
@@ -659,7 +658,7 @@ public function restart( $args, $assoc_args, $whitelisted_containers = [] ) {
 	 */
 	public function reload( $args, $assoc_args, $whitelisted_containers = [], $reload_commands = [] ) {
 		$whitelisted_containers = [ 'nginx', 'php' ];
-		$reload_commands['php'] = 'php kill -USR2 1';
+		$reload_commands['php'] = 'kill -USR2 1';
 		parent::reload( $args, $assoc_args, $whitelisted_containers, $reload_commands );
 	}
 

diff --git a/src/Site_WP_Docker.php b/src/Site_WP_Docker.php
@@ -158,7 +158,7 @@ public function generate_docker_compose_yml( array $filters = [] ) {
 
 		$base[] = $php;
 		$base[] = $nginx;
-		$base[] = $mailhog;
+		//$base[] = $mailhog;
 		$base[] = $phpmyadmin;
 
 		if ( in_array( 'redis', $filters, true ) ) {

diff --git a/templates/config/php-fpm/php.ini.mustache b/templates/config/php-fpm/php.ini.mustache
@@ -4,4 +4,4 @@ upload_max_filesize = 100M
 post_max_size = 100M
 
 [mail function]
-sendmail_path = /usr/sbin/sendmail -S mailhog:1025
+sendmail_path = /usr/sbin/sendmail -t -i