WebSVN – ALCASAR – Diff – //web/acc/admin/federation.php

 	$l_field		= "Champ";
 	$l_go_network_conf_page	= "Allez sur la page de configuration réseau.";
 	$l_host_name		= "Nom d'hôte";
 	$l_hosts_settings	= "Paramètres de réplication des hôtes distants";
 	$l_import_ssh_key	= "Importez ici les clés publiques des secondaires";
+	$l_in_progress		= "En cours ...";
 	$l_install_repl		= "Installer la fédération";
-	$l_remote_hosts		= "Hôtes distants";
+	$l_install_repl_s	= "Installer la fédération";
 	$l_ip_address		= "Adresse IP";
 	$l_no_host_connected = "Aucun hote connecté";
 	$l_no_ssh_key		= "Aucune clé SSH importée.";
-	$l_not_connected	= "Non connecté";
+	$l_not_connected	= "localhost";
-	$l_pubkey_to_deploy	= "Si cet ALCASAR est secondaire, copiez la clé publique ci-dessous pour l'importez dans le primaire.";
+	$l_pubkey_to_deploy	= "Copiez la clé publique ci-dessous dans un fichier pour l'importez dans le primaire.";
 	$l_remote_access_mgmt	= "Gestion des accès distants";
 	$l_remote_role		= "Rôle de l'hôte distant";
 	$l_repl_io_running	= "État de la réplication";
 	$l_started		= "Démarré";
 	$l_stopped		= "Arrêté";
-	$l_in_progress		= "En cours ...";
+	$l_remote_hosts		= "Hôtes distants";
 	$l_replication_install	= "Installer la Fédération";
 	$l_replication_title	= "Fédération";
 	$l_role			= "Rôle";
 	$l_role_primary		= "Primaire";
 	$l_role_secondary	= "Secondaire";
 	$l_field		= "campo";
 	$l_go_network_conf_page	= "Vaya a la página de configuración de red";
 	$l_host_name		= "Nombre de host";
 	$l_hosts_settings	= "Configuración de replicación de hosts remotos";
 	$l_import_ssh_key	= "Importe aquí las claves públicas de los servidores secundarios";
+	$l_in_progress		= "En curso ...";
 	$l_install_repl		= "Creación de la federación";
 	$l_remote_hosts		= "Hosts remotos";
 	$l_ip_address		= "dirección IP";
 	$l_no_host_connected = "No hay ningún host conectado.";
 	$l_no_ssh_key		= "No se ha importado ninguna clave SSH.";
-	$l_not_connected	= "No conectado";
+	$l_not_connected	= "localhost";
-	$l_pubkey_to_deploy	= "La clave debe implementarse en los servidores primarios.";
+	$l_pubkey_to_deploy	= "Copie la clave pública que aparece a continuación en un archivo para importarla al primario.";
 	$l_remote_access_mgmt	= "Gestión de accesos remotos";
 	$l_remote_role		= "Función del host remoto";
 	$l_repl_io_running	= "estado de replicación";
 	$l_started		= "Iniciado";
 	$l_stopped		= "Decreto";
-	$l_in_progress		= "En curso ...";
 	$l_replication_install	= "Creación de la federación";
 	$l_replication_title	= "Federación";
 	$l_role			= "Papel";
 	$l_role_primary		= "Primaria";
 	$l_role_secondary	= "Secundaria";
 	$l_field		= "Field";
 	$l_go_network_conf_page	= "Go to network config page.";
 	$l_host_name		= "Host name";
 	$l_hosts_settings	= "Remote replicated hosts settings";
 	$l_import_ssh_key	= "Import here the public keys of the secondary servers";
+	$l_in_progress		= "In progress...";
 	$l_install_repl		= "Setting up the federation";
 	$l_remote_hosts		= "Remote hosts";
 	$l_ip_address		= "IP address";
 	$l_no_host_connected = "No host connected";
 	$l_no_ssh_key		= "No SSH key imported.";
-	$l_not_connected	= "Not connected";
+	$l_not_connected	= "localhost";
-	$l_pubkey_to_deploy	= "The following public key has to be deployed on remote primary servers.";
+	$l_pubkey_to_deploy	= "Copy the public key below into a file to import it into the primary.";
 	$l_remote_access_mgmt	= "Remote access management";
 	$l_remote_role		= "Remote role";
 	$l_repl_io_running	= "Replication state";
 	$l_started		= "Started";
 	$l_stopped		= "Stopped";
-	$l_in_progress		= "In progress...";
 	$l_replication_install	= "Setting up the federation";
 	$l_replication_title	= "Federation";
 	$l_role			= "Role";
 	$l_role_primary		= "Primary";
 	$l_role_secondary	= "Secondary";
 	$l_want_server_as_prim	= "Want server to be a primary?";
+}
 $reg_ip      = '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$';
 $reg_ip_port = '^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\:([1-9]|[1-9][0-9]|[1-9][0-9]{2}|[1-9][0-9]{3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5]))$';
-$reg_host    = '^[a-zA-Z0-9-_]+$';
+$reg_host    = '^[a-zA-Z0-9-_.]+$';
 $reg_ssh_key = "^(ssh-dss AAAAB3NzaC1kc3|ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNT|sk-ecdsa-sha2-nistp256@openssh.com AAAAInNrLWVjZHNhLXNoYTItbmlzdHAyNTZAb3BlbnNzaC5jb2|ssh-ed25519 AAAAC3NzaC1lZDI1NTE5|sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29t|ssh-rsa AAAAB3NzaC1yc2)[0-9A-Za-z+/]+[=]{0,3}(\s.*)?$";
 $reg_linux_user = "[a-z_][a-z0-9_-]*[$]?";
 $reg_mariadb_user = "^[a-z]{1,32}$";
 // Allow new SSH file size of 128kB;
 $max_ssh_file_size = 131072;
 $choice = $_POST['choice'] ?? "";
 switch ($choice) {
-	case 'install_replication':
+	case 'install_replication_p':
+		if (isset($conf['REPLICATION']) && ($conf['REPLICATION'] == "primary" || $conf['REPLICATION'] == "secondary"))  {
+			exit("Replication already installed.");}
+		$stdout = [];
+		exec('sudo /usr/local/bin/alcasar-replication-install.sh -p 2>&1', $stdout);
+		header('Location: '.$_SERVER['PHP_SELF']);
+		break;
+	case 'install_replication_s':
-		if (isset($conf['REPLICATION']) && $conf['REPLICATION'] == "on") {
+		if (isset($conf['REPLICATION']) && ($conf['REPLICATION'] == "primary" || $conf['REPLICATION'] == "secondary"))  {
 			exit("Replication already installed.");}
 		$stdout = [];
-		exec('sudo /usr/local/bin/alcasar-replication-install.sh 2>&1', $stdout);
+		exec('sudo /usr/local/bin/alcasar-replication-install.sh -s 2>&1', $stdout);
 		header('Location: '.$_SERVER['PHP_SELF']);
 		break;
 	case 'uninstall_replication':
 		if (!isset($conf['REPLICATION']) || $conf['REPLICATION'] == "off") {
 			exit("Replication not installed.");}
 		break;
 	case 'change_replicas_state':
 		$stdout = [];
 		$return = 0;
 		$key_prefix = "action_primary_";
 		// Search for action_primary_<hostname> key
 		foreach ($_POST as $key => $value) {
 			if (!str_starts_with($key, $key_prefix)) {
 				continue;}
 			// Get the remote name
 			// disable on load
 			submitButton.disabled = true;
 		});
 		window.onload = main;
 		function main() {
+			const rolePrimaryRadio = document.getElementById('role_primary');
+			const roleSecondaryRadio = document.getElementById('role_secondary');
+			if (roleSecondaryRadio.checked) { show_fields_for_new_secondary(); }
-			show_fields_for_new_primary();
+			if (rolePrimaryRadio.checked) { show_fields_for_new_primary(); }
 			set_required_on_common_fields();
 			enable_apply_btn_if_selected_remote_action();
 			enable_apply_btn_if_selected_ssh_key_action();
+		}
 		// Set 'required' attribute on fields needed by both primary and secondary
 </head>
 <body>
 <div id="ldoverlay" class="overlay">
 	<div class="lds-spinner" id="spinner"><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div><div></div></div>
 </div>
-<?php if ($conf['REPLICATION'] == "on") { ?>
+<?php if ($conf['REPLICATION'] == "primary" || $conf['REPLICATION'] == "secondary") { ?>
 <div class="panel">
 	<div class="panel-header"><?= $l_hosts_settings ?></div>
 </div>
 <div>
 <table width="100%" cellspacing="0" cellpadding="5" border="1">
+					}
 					// List each connection
 					foreach ($connected_prims as $prim) {
 						?>
 						<tr>
 							<td><?php
 								$master_host = $prim["Master_Host"];
-								if ($master_host != "127.0.0.1") {
+								if ($master_host = "127.0.0.1") {
 									echo "$master_host";
 								} else {
 									echo "$l_not_connected";
+								}
 							?></td>
 					<summary><?= $l_error_details ?></summary>
 					<textarea readonly cols=50 rows=10><?= $errors_msg[$section."_error"] ?></textarea>
 				</details>
 			<?php } ?>
 		</td>
+		<?php if (isset($conf['REPLICATION']) && ($conf['REPLICATION'] == "secondary")) { ?>
 		<td width="50%" valign="middle" align="center">
 			<?php $section = "add_replica" ?>
 			<form id="form_add_remote" action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="POST">
 			<input type="hidden" name="choice" value="<?= $section ?>">
 				<table cellspacing="2" cellpadding="3" border="1">
 					<tr>
 						<td><?= $l_remote_role ?></td>
 						<td>
 							<fieldset>
 								<div>
-									<input type="radio" id="role_primary" name="role" value="primary" checked onClick="show_fields_for_new_primary()"/>
+									<input type="radio" id="role_primary" name="role" value="primary"
+									<?= (isset($conf['REPLICATION']) && $conf['REPLICATION'] == "secondary") ? 'checked' : '' ?>
+									onClick="show_fields_for_new_primary()"/>
 									<label for="role_primary"><?= $l_role_primary ?></label>
-									<input type="radio" id="role_secondary" name="role" value="secondary" onClick="show_fields_for_new_secondary()"/>
+									<input type="radio" id="role_secondary" name="role" value="secondary"
+									<?= (isset($conf['REPLICATION']) && $conf['REPLICATION'] == "primary") ? 'checked' : '' ?>
+									onClick="show_fields_for_new_secondary()"/>
 									<label for="role_secondary"><?= $l_role_secondary ?></label>
 								</div>
 							</fieldset>
 						</td>
 					</tr>
 					<summary><?= $l_error_details ?></summary>
 					<textarea readonly cols=50 rows=10><?= htmlspecialchars($errors_msg[$section."_error"]) ?></textarea>
 				</details>
 			<?php } ?>
 		</td>
+		<?php } ?>
 	</tr>
 </table>
 </div>
 <br>
 <div class="panel">
 	<div class="panel-header"><?= $l_remote_access_mgmt ?></div>
 </div>
 <div>
 <table width="100%" cellspacing="0" cellpadding="5" border="1">
 	<tr>
+		<?php if (isset($conf['REPLICATION']) && ($conf['REPLICATION'] == "secondary")) { ?>
+			<td width="100%" valign="middle" align="center">
+				<center><?= $l_pubkey_to_deploy ?><br></center>
+				<br>
+				<?php
+				$stdout = [];
+				$return = 0;
+				exec("sudo /usr/local/bin/alcasar-replication-ssh-keys-management.sh --show-pubkey 2>&1", $stdout, $return);
+				// If script went wrong
+				if ($return != 0) {
+					echo "<p>$l_cant_read_pubkey</p>";
+				} else {
+					 $pubkey = htmlspecialchars(implode(PHP_EOL, $stdout), ENT_QUOTES, 'UTF-8'); ?>
+				<textarea id="pubkey_stdout" readonly style="width: 75%; min-height: 100px; resize: vertical; white-space: pre-wrap; font-family: monospace;"><?= $pubkey ?></textarea>
+				<?php }
+			} ?>
+		<?php if (isset($conf['REPLICATION']) && ($conf['REPLICATION'] == "primary")) { ?>
-		<td width="50%" align="center">
+			<td width="50%" align="center">
 			<center><?= $l_ssh_keys_for_primary ?></center>
 			<?php $section = "delete_ssh_key" ?>
 			<form action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="POST">
 			<input type="hidden" name="choice" value="<?= $section ?>">
 			<table cellspacing="2" cellpadding="3" border="1" style="table-layout: auto; min-width: 10em;">
 					<summary><?= $l_error_details ?></summary>
 					<textarea readonly cols=50 rows=10><?= $errors_msg[$section."_error"] ?></textarea>
 				</details>
 			<?php } ?>
 		</td>
-		<?php if (! $public_key_exist) { ?>
-			<td width="25%" valign="middle" align="center">
-				<center><?= $l_pubkey_to_deploy ?><br></center>
-				<br>
-				<?php
-				$stdout = [];
-				$return = 0;
-				exec("sudo /usr/local/bin/alcasar-replication-ssh-keys-management.sh --show-pubkey 2>&1", $stdout, $return);
-				// If script went wrong
-				if ($return != 0) {
-					echo "<p>$l_cant_read_pubkey</p>";
-				} else { ?>
-					<input type="text" id="pubkey_stdout" readonly value="<?= implode(PHP_EOL, $stdout) ?>">
-				<?php } ?>
+		<?php } ?>
-		</td> <?php } ?>
 	</tr>
 </table>
 </div>
 <br>
 <?php } ?>
 <div class="panel">
 	<div class="panel-header"><?= $l_replication_title ?></div>
 </div>
 <table width="100%" cellspacing="0" cellpadding="5" border="1">
 	<tr>
+		<?php if (isset($conf['REPLICATION']) && ($conf['REPLICATION'] == "primary" || $conf['REPLICATION'] == "secondary")) { ?>
-		<td width="50%" valign="middle" align="center">
+			<td width="50%" valign="middle" align="center">
-			<?php if ($conf['REPLICATION'] == "on") { ?>
 				<form action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="POST" onsubmit="return confirm('<?= $l_confirm_uninstall ?>');">
 					<input type="hidden" name="choice" value="uninstall_replication">
 					<input type="submit" value="<?= $l_uninstall_repl ?>" onClick="document.getElementById('ldoverlay').style.display='block';">
 				</form>
+			</td>
 			<?php } else { ?>
+			<td width="50%" valign="middle" align="center">
+				<form action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="POST">
+					<input type="hidden" name="choice" value="install_replication_p">
+					<input type="submit" value="<?= $l_install_repl." (".$l_role."=".$l_role_primary.")" ?>" onClick="document.getElementById('ldoverlay').style.display='block';">
+				</form>
+			</td><td width="50%" valign="middle" align="center">
 				<form action="<?= htmlspecialchars($_SERVER['PHP_SELF']) ?>" method="POST">
-					<input type="hidden" name="choice" value="install_replication">
+					<input type="hidden" name="choice" value="install_replication_s">
-					<input type="submit" value="<?= $l_install_repl ?>" onClick="document.getElementById('ldoverlay').style.display='block';">
+					<input type="submit" value="<?= $l_install_repl." (".$l_role."=".$l_role_secondary.")" ?>" onClick="document.getElementById('ldoverlay').style.display='block';">
 				</form>
+			</td>
 			<?php } ?>
-		</td>
-		<?php if ($conf['REPLICATION'] == "on") { ?>
+		<?php if (isset($conf['REPLICATION']) && $conf['REPLICATION'] == "primary") { ?>
 			<td width="50%" valign="middle" align="center">
 				<?php if ($conf['SSH_WAN'] !== '0') { ?>
 					<input type="checkbox" id="togglessh" checked disabled>
 					<label for="togglessh"><?= $l_ssh_wan_enabled ?></label>
 				<?php } else { ?>
 				<p><?= $l_want_server_as_prim ?></p>
 					<input type="checkbox" id="togglessh" disabled>
 					<label for="togglessh"><b><?= $l_ssh_wan_must_be_on ?></b> <a href="/acc/admin/network.php"><?= $l_go_network_conf_page ?></a></label>
 				<?php } ?>
-			</td>
 		<?php } ?>
 	</tr>
 </table>
 </body>
 </html>

Subversion Repositories ALCASAR

(root)//web/acc/admin/federation.php – Rev 3321 → 3322