Merge pull request #363 from kirtangajjar/fix/postfix-configuration

Fix relayhost and msmrtpc changes in postifx

Author: mrrobot47

migrations/container/20201120090951_site-command_postfix_msmtrpc_fix.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace EE\Migration;
+
+use EE;
+use EE\RevertableStepProcessor;
+use EE\Model\Site;
+
+class PostfixMsmtrpcFix extends Base {
+
+	private $sites;
+	/** @var RevertableStepProcessor $rsp Keeps track of migration state. Reverts on error */
+	private static $rsp;
+
+	public function __construct() {
+
+		parent::__construct();
+		$this->sites = Site::all();
+		if ( $this->is_first_execution || ! $this->sites ) {
+			$this->skip_this_migration = true;
+		}
+	}
+
+	/**
+	 * Execute nginx config updates.
+	 *
+	 * @throws EE\ExitException
+	 */
+	public function up() {
+
+		if ( $this->skip_this_migration ) {
+			EE::debug( 'Skipping postfix-msmtrpc-fix migration as it is not needed.' );
+
+			return;
+		}
+
+		foreach ( $this->sites as $site ) {
+
+			if ( $site->site_type !== 'html' ) {
+				mkdir( $site->site_fs_path . '/config/php/misc' );
+				touch( $site->site_fs_path . '/config/php/misc/msmtprc' );
+
+				chdir( $site->site_fs_path );
+				EE::exec( \EE_DOCKER::docker_compose_with_custom() . " exec --user=root php sh -c 'rm /etc/msmtprc'" );
+				EE::exec( \EE_DOCKER::docker_compose_with_custom() . " exec --user=root php sh -c 'ln -s /usr/local/etc/misc/msmtprc /etc/msmtprc'" );
+				EE::exec( \EE_DOCKER::docker_compose_with_custom() . " exec --user=root php sh -c 'chown -R www-data:www-data /usr/local/etc/misc'" );
+				EE::exec( \EE_DOCKER::docker_compose_with_custom() . " exec --user=root php sh -c 'chown -R www-data:www-data /etc/msmtprc'" );
+
+				EE\Site\Utils\configure_postfix( $site->site_url, $site->site_fs_path );
+
+			}
+		}
+
+	}
+
+	/**
+	 * Bring back the existing old nginx config.
+	 *
+	 * @throws EE\ExitException
+	 */
+	public function down() {
+
+	}
+}

src/Site_Command.php

@@ -164,9 +164,9 @@ public function __invoke( $args, $assoc_args ) {
 	 * @param array $args          Command line arguments passed to site-command.
 	 * @param string $default_type Default site-type.
 	 *
+	 * @return string site-type.
 	 * @throws \EE\ExitException
 	 *
-	 * @return string site-type.
 	 */
 	private function determine_type( $default_type, $args ) {
 

src/helper/class-ee-site.php

@@ -845,7 +845,7 @@ protected function sendmail_path_update( $msmtp ) {
 			}, $custom_ini_data );
 		} else {
 			$custom_ini_data = array_map( function ( $custom_ini_data ) {
-				$sendmail_path = 'sendmail_path = /usr/sbin/sendmail -t -i -f [email protected]';
+				$sendmail_path = 'sendmail_path = /usr/sbin/sendmail -t -i -f [email protected]';
 
 				return stristr( $custom_ini_data, 'sendmail_path' ) ? "$sendmail_path\n" : $custom_ini_data;
 			}, $custom_ini_data );

src/helper/site-utils.php

@@ -119,11 +119,11 @@ function get_site_info( $args, $site_enabled_check = true, $exit_if_not_found =
 /**
  * Populate basic site info from db.
  *
- * @param array $domains       Array of all domains.
+ * @param array $domains Array of all domains.
  *
  * @return string $preferred_challenge Type of challenge preffered.
  */
-function get_preferred_ssl_challenge(array $domains) {
+function get_preferred_ssl_challenge( array $domains ) {
 
 	foreach ( $domains as $domain ) {
 		if ( preg_match( '/^\*/', $domain ) ) {
@@ -436,7 +436,8 @@ function site_status_check( $site_url ) {
  * Function to pull the latest images and bring up the site containers and set EasyEngine header.
  *
  * @param string $site_fs_path Root directory of the site.
- * @param array $containers    The minimum required conatainers to start the site. Default null, leads to starting of all containers.
+ * @param array $containers    The minimum required conatainers to start the site. Default null, leads to starting of
+ *                             all containers.
  *
  * @throws \Exception when docker-compose up fails.
  */
@@ -520,7 +521,17 @@ function set_postfix_files( $site_url, $site_service_dir ) {
 function configure_postfix( $site_url, $site_fs_path ) {
 
 	chdir( $site_fs_path );
-	EE::exec( \EE_DOCKER::docker_compose_with_custom() . ' exec postfix postconf -e \'relayhost =\'' );
+
+	$default_from = EE::launch( \EE_DOCKER::docker_compose_with_custom() . ' exec postfix sh -c \'echo $REPLY_EMAIL\'' )->stdout;
+
+	if ( ! trim( $default_from ) ) {
+		$default_from = "no-reply@$site_url";
+	}
+
+	EE::exec( \EE_DOCKER::docker_compose_with_custom() . " exec php sh -c 'echo \"host postfix\ntls off\nfrom $default_from\" > /etc/msmtprc'" );
+	$relay_host = EE::launch( \EE_DOCKER::docker_compose_with_custom() . ' exec postfix sh -c \'echo $RELAY_HOST\'' )->stdout;
+	$relay_host = trim( $relay_host, "\n\r" );
+	EE::exec( \EE_DOCKER::docker_compose_with_custom() . ' exec postfix postconf -e \'relayhost = ' . $relay_host . '\'' );
 	EE::exec( \EE_DOCKER::docker_compose_with_custom() . ' exec postfix postconf -e \'smtpd_recipient_restrictions = permit_mynetworks\'' );
 	$launch      = EE::launch( sprintf( 'docker inspect -f \'{{ with (index .IPAM.Config 0) }}{{ .Subnet }}{{ end }}\' %s', $site_url ) );
 	$subnet_cidr = trim( $launch->stdout );

src/site-type/HTML.php

@@ -132,12 +132,12 @@ 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 . ',';
 			}
 		}
+    
 		$this->site_data['alias_domains'] = substr( $this->site_data['alias_domains'], 0, - 1 );
-
 		$this->site_data['site_ssl'] = get_value_if_flag_isset( $assoc_args, 'ssl', 'le' );
 
 		if ( 'custom' === $this->site_data['site_ssl'] ) {
@@ -192,6 +192,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;
 		}
 
@@ -235,7 +236,7 @@ private function configure_site_files() {
 
 		$server_name = implode( ' ', explode( ',', $this->site_data['alias_domains'] ) );
 
-		$data = [
+		$data                 = [
 			'server_name'   => $server_name,
 			'document_root' => $this->site_data['site_container_fs_path'],
 		];

src/site-type/Site_HTML_Docker.php

@@ -12,7 +12,7 @@ class Site_HTML_Docker {
 	 * Generate docker-compose.yml according to requirement.
 	 *
 	 * @param array $filters Array to determine the docker-compose.yml generation.
-	 ** @param array $volumes Array containing volume info passable to \EE_DOCKER::get_mounting_volume_array().
+	 * @param array $volumes Array containing volume info passable to \EE_DOCKER::get_mounting_volume_array().
 	 *
 	 * @return String docker-compose.yml content string.
 	 */