Merge branch 'develop' into fix/postfix-configuration

Signed-off-by: Riddhesh Sanghvi <[email protected]>

Author: mrrobot47

composer.json

@@ -22,7 +22,9 @@
             "src/helper/SimpleDnsCloudflareSolver.php",
             "src/helper/Site_Self_Signed.php",
             "src/helper/Site_Letsencrypt.php",
-            "src/helper/Shutdown_Handler.php"
+            "src/helper/Shutdown_Handler.php",
+            "src/clone/Cloner.php",
+            "src/clone/clone-utils.php"
         ]
     },
     "extra": {

migrations/db/20180910124650_site-command_create_table_site_migration.php

@@ -48,7 +48,6 @@ public function up() {
 			db_root_password     VARCHAR,
 			db_host              VARCHAR,
 			db_port              VARCHAR,
-			subnet_ip            VARCHAR,
 			app_sub_type         VARCHAR,
 			app_admin_url        VARCHAR,
 			app_admin_email      VARCHAR,

migrations/db/20210719150420_site-command_add_column_subnet_ip_migration.php

@@ -0,0 +1,46 @@
+<?php
+namespace EE\Migration;
+
+use EE;
+
+class AddDaemonJson extends Base {
+
+	public function __construct() {
+
+		parent::__construct();
+		if ( $this->is_first_execution ) {
+			$this->skip_this_migration = true;
+		}
+	}
+
+	/**
+	 * Execute create table query for site and sitemeta table.
+	 *
+	 * @throws EE\ExitException
+	 */
+	public function up() {
+
+		if ( php_uname('s') === 'Linux' ) {
+			if ( file_exists( '/etc/docker/daemon.json' ) ) {
+				$existin_config = file_get_contents( '/etc/docker/daemon.json' );
+				$existin_config = json_decode( $existin_config, true );
+			} else {
+				$existin_config = [];
+			}
+
+			$existin_config['default-address-pools'] = json_decode( '[{"base":"10.0.0.0/8","size":24}]', true );
+			file_put_contents( '/etc/docker/daemon.json', json_encode( $existin_config ) );
+
+			EE::launch( 'command -v systemctl && systemctl restart docker || service docker restart' );
+		}
+	}
+
+	/**
+	 * Execute drop table query for site and sitemeta table.
+	 *
+	 * @throws EE\ExitException
+	 */
+	public function down() {
+
+	}
+}

migrations/db/20210728160510_site-command_add_daemon_json.php

@@ -44,7 +44,6 @@ public function up() {
 		ensure_global_network_initialized();
 
 		foreach ( $sites as $site ) {
-			$site->subnet_ip = EE\Site\Utils\get_available_subnet();
 			$site->save();
 
 			$site_type = $site->site_type === 'html' ? new EE\Site\Type\HTML() :
@@ -55,10 +54,12 @@ public function up() {
 			$site_data = (array) $site_type->site_data;
 			$site_data = reset($site_data );
 			$site_type->site_data = $site_data;
-			$site_type->dump_docker_compose_yml();
+			$no_https        = $site_data['site_ssl'] ? false : true;
+			$site_type->dump_docker_compose_yml([ 'nohttps' => $no_https ]);
 
 			if ( $site->site_enabled ) {
-				$site_type->refresh( [ $site->site_url ], [] );
+				$site_type->disable( [ $site->site_url ], [] );
+				$site_type->enable( [ $site->site_url ], [] );
 			}
 		}
 	}
@@ -70,15 +71,5 @@ public function up() {
 	 */
 	public function down() {
 
-		/**
-		 * Reset Subnet IP column in table.
-		 */
-		$query = 'UPDATE sites set subnet_ip=\'\';';
-
-		try {
-			self::$pdo->exec( $query );
-		} catch ( PDOException $exception ) {
-			EE::error( 'Encountered Error while dropping table: ' . $exception->getMessage(), false );
-		}
 	}
 }