Merge branch 'develop' into fix/wildcard-db-entry

Author: mbtamuli

src/Site_WP_Command.php

@@ -323,7 +323,7 @@ private function configure_site_files() {
 		$env_content     = EE\Utils\mustache_render( SITE_WP_TEMPLATE_ROOT . '/config/.env.mustache', $env_data );
 		$php_ini_content = EE\Utils\mustache_render( SITE_WP_TEMPLATE_ROOT . '/config/php-fpm/php.ini.mustache', [] );
 
-		EE\Siteutils\add_site_redirects( $this->site['name'], $this->le );
+		EE\SiteUtils\add_site_redirects( $this->site['name'], $this->le );
 
 		try {
 			$this->fs->dumpFile( $site_docker_yml, $docker_compose_content );
@@ -333,6 +333,9 @@ private function configure_site_files() {
 			$this->fs->dumpFile( $site_nginx_default_conf, $default_conf_content );
 			$this->fs->mkdir( $site_conf_dir . '/php-fpm' );
 			$this->fs->dumpFile( $site_php_ini, $php_ini_content );
+
+			EE\SiteUtils\set_postfix_files( $this->site['name'], $site_conf_dir );
+
 			EE::success( 'Configuration files copied.' );
 		} catch ( Exception $e ) {
 			$this->catch_clean( $e );
@@ -395,22 +398,22 @@ private function create_site( $assoc_args ) {
 		$this->site['root'] = WEBROOT . $this->site['name'];
 		$this->level        = 1;
 		try {
-			EE\Siteutils\create_site_root( $this->site['root'], $this->site['name'] );
+			EE\SiteUtils\create_site_root( $this->site['root'], $this->site['name'] );
 			$this->level = 2;
-			EE\Siteutils\setup_site_network( $this->site['name'] );
+			EE\SiteUtils\setup_site_network( $this->site['name'] );
 			$this->maybe_verify_remote_db_connection();
 			$this->level = 3;
 			$this->configure_site_files();
 
-			EE\Siteutils\start_site_containers( $this->site['root'] );
-
+			EE\SiteUtils\start_site_containers( $this->site['root'] );
+			EE\SiteUtils\configure_postfix( $this->site['name'], $this->site['root'] );
 			$this->wp_download_and_config( $assoc_args );
 
 			if ( ! $this->skip_install ) {
-				EE\Siteutils\create_etc_hosts_entry( $this->site['name'] );
+				EE\SiteUtils\create_etc_hosts_entry( $this->site['name'] );
 				if ( ! $this->skip_chk ) {
 					$this->level = 4;
-					EE\Siteutils\site_status_check( $this->site['name'] );
+					EE\SiteUtils\site_status_check( $this->site['name'] );
 				}
 				$this->install_wp();
 			}

src/Site_WP_Docker.php

@@ -142,6 +142,26 @@ public function generate_docker_compose_yml( array $filters = [] ) {
 		];
 		$mailhog['networks']     = $network_default;
 
+		// postfix configuration.
+		$postfix['service_name'] = [ 'name' => 'postfix' ];
+		$postfix['image']        = [ 'name' => 'easyengine/postfix:v' . EE_VERSION ];
+		$postfix['hostname']     = [ 'name' => '${VIRTUAL_HOST}' ];
+		$postfix['restart']      = $restart_default;
+		$postfix['labels']       = [
+			'label' => [
+				'name' => 'io.easyengine.site=${VIRTUAL_HOST}',
+			],
+		];
+		$postfix['volumes']      = [
+			'vol' => [
+				[ 'name' => '/dev/log:/dev/log' ],
+				[ 'name' => './config/postfix/ssl:/etc/ssl/postfix' ],
+				[ 'name' => './app/postfix/spool:/var/spool/postfix' ],
+			],
+		];
+		$postfix['networks']     = $network_default;
+
+
 		// redis configuration.
 		$redis['service_name'] = [ 'name' => 'redis' ];
 		$redis['image']        = [ 'name' => 'easyengine/redis:v' . EE_VERSION ];
@@ -160,6 +180,7 @@ public function generate_docker_compose_yml( array $filters = [] ) {
 		$base[] = $nginx;
 		//$base[] = $mailhog;
 		$base[] = $phpmyadmin;
+		$base[] = $postfix;
 
 		if ( in_array( 'redis', $filters, true ) ) {
 			$base[] = $redis;

templates/docker-compose.mustache

@@ -9,6 +9,9 @@ services:
     {{#image}}
     image: {{name}}
     {{/image}}
+    {{#hostname}}
+    hostname: {{name}}
+    {{/hostname}}
     {{#depends_on}}
     depends_on:
       - {{name}}
@@ -20,7 +23,7 @@ services:
     command: {{name}}
     {{/command}}
     {{#labels}}
-    labels: 
+    labels:
     {{#label}}
       - "{{name}}"
     {{/label}}
@@ -41,12 +44,12 @@ services:
     networks:
       - {{name}}
     {{/networks}}
-    
+
 {{/services}}
 
 {{#network}}
 networks:
   site-network:
     external:
       name: ${VIRTUAL_HOST}
-{{/network}}  
+{{/network}}