Add database host selection for app quick install (hestiacp#4503)

Author: etfz

web/src/app/System/HestiaApp.php

@@ -200,6 +200,7 @@ public function databaseAdd(
 		string $dbuser,
 		string $dbpass,
 		string $dbtype = "mysql",
+		string $dbhost = "localhost",
 		string $charset = "utf8mb4",
 	) {
 		$v_password = tempnam("/tmp", "hst");
@@ -211,7 +212,7 @@ public function databaseAdd(
 			$dbuser,
 			$v_password,
 			$dbtype,
-			"localhost",
+			$dbhost,
 			$charset,
 		]);
 		if (!$status) {

web/src/app/WebApp/AppWizard.php

@@ -14,6 +14,7 @@ class AppWizard {
 
 	private $database_config = [
 		"database_create" => ["type" => "boolean", "value" => true],
+		"database_host" => ["type" => "select"],
 		"database_name" => ["type" => "text", "placeholder" => "auto"],
 		"database_user" => ["type" => "text", "placeholder" => "auto"],
 		"database_password" => ["type" => "password", "placeholder" => "auto"],
@@ -72,6 +73,18 @@ public function getOptions() {
 		]);
 
 		if ($this->appsetup->withDatabase()) {
+			exec(HESTIA_CMD . "v-list-database-hosts json", $output, $return_var);
+			$db_hosts_tmp1 = json_decode(implode("", $output), true);
+			$db_hosts_tmp2 = array_map(function ($host) {
+				return $host["HOST"];
+			}, $db_hosts_tmp1);
+			$db_hosts = array_values(array_unique($db_hosts_tmp2));
+			unset($output);
+			unset($db_hosts_tmp1);
+			unset($db_hosts_tmp2);
+
+			$this->database_config["database_host"]["options"] = $db_hosts;
+
 			$options = array_merge($options, $this->database_config);
 		}
 		return $options;
@@ -119,6 +132,8 @@ public function execute(array $options) {
 					$options["database_name"],
 					$options["database_user"],
 					$options["database_password"],
+					"mysql",
+					$options["database_host"],
 				)
 			) {
 				$this->errors[] = "Error adding database";

web/src/app/WebApp/Installers/Drupal/DrupalSetup.php

@@ -70,7 +70,9 @@ public function install(array $options = null): bool {
 				$options["database_user"] .
 				":" .
 				$options["database_password"] .
-				"@localhost:3306/" .
+				"@" .
+				$options["database_host"] .
+				":3306/" .
 				$this->appcontext->user() .
 				"_" .
 				$options["database_name"] .

web/src/app/WebApp/Installers/Flarum/FlarumSetup.php

@@ -157,7 +157,7 @@ public function install(array $options = null): bool {
 		$webDomain = ($sslEnabled ? "https://" : "http://") . $this->domain;
 		$webPort = $sslEnabled ? "443" : "80";
 
-		$mysql_host = "localhost";
+		$mysql_host = $options["database_host"];
 		$mysql_database = addcslashes(
 			$this->appcontext->user() . "_" . $options["database_name"],
 			"\\'",

web/src/app/WebApp/Installers/Joomla/JoomlaSetup.php

@@ -71,6 +71,7 @@ public function install(array $options = null): bool {
 		}
 
 		// Database credentials
+		$dbHost = $options["database_host"];
 		$dbName = $this->appcontext->user() . "_" . $options["database_name"];
 		$dbUser = $this->appcontext->user() . "_" . $options["database_user"];
 		$dbPass = $options["database_password"];
@@ -95,7 +96,7 @@ public function install(array $options = null): bool {
 			"--db-pass=" . $dbPass,
 			"--db-name=" . $dbName,
 			"--db-prefix=" . Util::generate_string(5, false) . "_",
-			"--db-host=localhost",
+			"--db-host=" . $dbHost,
 			"--db-type=mysqli",
 		];
 

web/src/app/WebApp/Installers/MediaWiki/MediaWikiSetup.php

@@ -69,7 +69,7 @@ public function install(array $options = null) {
 			[
 				"/usr/bin/php" . $options["php_version"],
 				$this->getDocRoot("maintenance/install.php"),
-				"--dbserver=localhost",
+				"--dbserver=" . $options["database_host"],
 				"--dbname=" . $this->appcontext->user() . "_" . $options["database_name"],
 				"--installdbuser=" . $this->appcontext->user() . "_" . $options["database_user"],
 				"--installdbpass=" . $options["database_password"],

web/src/app/WebApp/Installers/Nextcloud/NextcloudSetup.php

@@ -51,6 +51,7 @@ public function install(array $options = null): bool {
 				"maintenance:install",
 				"--database mysql",
 				"--database-name " . $this->appcontext->user() . "_" . $options["database_name"],
+				"--database-host " . $options["database_host"],
 				"--database-user " . $this->appcontext->user() . "_" . $options["database_user"],
 				"--database-pass " . $options["database_password"],
 				"--admin-user " . $options["username"],

web/src/app/WebApp/Installers/Opencart/OpencartSetup.php

@@ -82,6 +82,7 @@ public function install(array $options = null): bool {
 				"/usr/bin/php" . $options["php_version"],
 				$this->getDocRoot("/install/cli_install.php"),
 				"install",
+				"--db_hostname " . $options["database_host"],
 				"--db_username " . $this->appcontext->user() . "_" . $options["database_user"],
 				"--db_password " . $options["database_password"],
 				"--db_database " . $this->appcontext->user() . "_" . $options["database_name"],

web/src/app/WebApp/Installers/Prestashop/PrestashopSetup.php

@@ -72,6 +72,7 @@ public function install(array $options = null): bool {
 			[
 				"/usr/bin/php" . $options["php_version"],
 				$this->getDocRoot("/install/index_cli.php"),
+				"--db_server=" . $options["database_host"],
 				"--db_user=" . $this->appcontext->user() . "_" . $options["database_user"],
 				"--db_password=" . $options["database_password"],
 				"--db_name=" . $this->appcontext->user() . "_" . $options["database_name"],

web/src/app/WebApp/Installers/WordPress/WordPressSetup.php

@@ -135,7 +135,7 @@ public function install(array $options = null) {
 						"'," .
 						$padding .
 						"'" .
-						addcslashes("localhost", "\\'") .
+						addcslashes($options["database_host"], "\\'") .
 						"' );";
 					break;
 				case "DB_CHARSET":