Merge branch 'develop' for v1.7.0

Author: mrrobot47

src/Site_WP_Docker.php

@@ -103,7 +103,7 @@ public function generate_docker_compose_yml( array $filters = [], $volumes ) {
 			],
 		];
 
-		$php['sysctls']  = sysctl_parameters();
+		$php['sysctls'] = sysctl_parameters();
 
 		$php['networks'] = [
 			'net' => [
@@ -156,10 +156,10 @@ public function generate_docker_compose_yml( array $filters = [], $volumes ) {
 			$nginx['environment']['env'][] = [ 'name' => "SSL_POLICY=$ssl_policy" ];
 		}
 
-		$nginx['volumes']  = [
+		$nginx['volumes'] = [
 			'vol' => \EE_DOCKER::get_mounting_volume_array( $volumes['nginx'] ),
 		];
-		$nginx['labels']   = [
+		$nginx['labels']  = [
 			'label' => [
 				'name' => 'io.easyengine.site=${VIRTUAL_HOST}',
 			],
@@ -207,6 +207,12 @@ public function generate_docker_compose_yml( array $filters = [], $volumes ) {
 		$postfix['image']        = [ 'name' => 'easyengine/postfix:' . $img_versions['easyengine/postfix'] ];
 		$postfix['hostname']     = [ 'name' => '${VIRTUAL_HOST}' ];
 		$postfix['restart']      = $restart_default;
+		$postfix['environment']  = [
+			'env' => [
+				[ 'name' => 'RELAY_HOST' ],
+				[ 'name' => 'REPLY_EMAIL' ],
+			],
+		];
 		$postfix['labels']       = [
 			'label' => [
 				'name' => 'io.easyengine.site=${VIRTUAL_HOST}',

src/WordPress.php

@@ -94,7 +94,8 @@ public function __construct() {
 	 * : Use redis cache for WordPress.
 	 *
 	 * [--vip]
-	 * : Create WordPress VIP GO site using your vip repo which contains wp-content dir. Default it will use skeleton repo.
+	 * : Create WordPress VIP GO site using your vip repo which contains wp-content dir. Default it will use skeleton
+	 * repo.
 	 * ---
 	 * default: https://github.com/Automattic/vip-go-skeleton.git
 	 * ---
@@ -266,7 +267,7 @@ public function create( $args, $assoc_args ) {
 		$this->logger->debug( 'assoc_args:', empty( $assoc_args ) ? array( 'NULL' ) : $assoc_args );
 		$this->site_data['site_url']  = strtolower( \EE\Utils\remove_trailing_slash( $args[0] ) );
 
-		$mu = \EE\Utils\get_flag_value( $assoc_args, 'mu' );
+		$mu                              = \EE\Utils\get_flag_value( $assoc_args, 'mu' );
 		$this->site_data['app_sub_type'] = $mu ?? 'wp';
 
 		EE::log( 'Starting site creation.' );
@@ -361,7 +362,7 @@ public function create( $args, $assoc_args ) {
 		if ( ! empty( $alias_domains ) ) {
 			$comma_seprated_domains = explode( ',', $alias_domains );
 			foreach ( $comma_seprated_domains as $domain ) {
-				$trimmed_domain = trim( $domain );
+				$trimmed_domain                   = trim( $domain );
 				$this->site_data['alias_domains'] .= $trimmed_domain . ',';
 			}
 		}
@@ -375,7 +376,7 @@ public function create( $args, $assoc_args ) {
 				$this->site_data['php_version'] = 5.6;
 			} elseif ( 7 === $floor ) {
 				$this->site_data['php_version'] = 7.4;
-				$old_version .= ' yet';
+				$old_version                    .= ' yet';
 			} elseif ( 8 === $floor ) {
 			$this->site_data['php_version'] = 8.0;
 			$old_version .= ' yet';
@@ -550,6 +551,7 @@ public function info( $args, $assoc_args ) {
 			$site = (array) Site::find( $this->site_data['site_url'] );
 			$site = reset( $site );
 			EE::log( json_encode( $site ) );
+
 			return;
 		}
 

templates/config/.env.mustache

@@ -13,3 +13,5 @@ VIRTUAL_HOST_EMAIL=example@{{virtual_host}}
 USER_ID={{user_id}}
 GROUP_ID={{group_id}}
 NEWRELIC_LICENSE_KEY=
+RELAY_HOST=
+REPLY_EMAIL=

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

@@ -4,4 +4,4 @@ upload_max_filesize = 100M
 post_max_size = 100M
 
 [mail function]
-sendmail_path = /usr/sbin/sendmail -t -i -f ee4@easyengine.io
+sendmail_path = /usr/sbin/sendmail -t -i -f no-reply@example.com