servername url changed
This commit is contained in:
Nicolas Roman
parent
e0f8d6ade1
commit
fde162d679
|
|
@ -48,7 +48,7 @@ if (!array_key_exists('auth', $_SESSION) || $_SESSION['auth']!=1) {
|
|||
|
||||
include_once EVOADMIN_BASE . '../inc/webadmin.php';
|
||||
|
||||
} elseif (preg_match('#^/webadmin/servername/(.*)/?$#', $uri, $params)) {
|
||||
} elseif (preg_match('#^/webadmin/(.*)/domain/?(edit)?/?(.*)?/$#', $uri, $params)) {
|
||||
|
||||
include_once EVOADMIN_BASE . '../inc/webadmin-servername.php';
|
||||
|
||||
|
|
|
|||
|
|
@ -18,138 +18,132 @@ require_once EVOADMIN_BASE . '../lib/domain.php';
|
|||
|
||||
global $conf;
|
||||
|
||||
if (isset($_GET['edit']) ) {
|
||||
if (isset($params[2]) && $params[2] == "edit") {
|
||||
$redirect_url = "/webadmin/" . $params[1] . "/domain/";
|
||||
|
||||
if (isset($params[3]) && $params[3] == "") http_redirect($redirect_url);
|
||||
|
||||
require_once EVOADMIN_BASE . '../evolibs/Form.php';
|
||||
|
||||
include_once EVOADMIN_BASE . '../tpl/header.tpl.php';
|
||||
include_once EVOADMIN_BASE . '../tpl/menu.tpl.php';
|
||||
|
||||
$form = new FormPage("Modification du ServerName", FALSE);
|
||||
$form->addField('domain_servername', new DomainInputFormField("ServerName", TRUE), $_GET['edit']);
|
||||
$form->addField('previous_servername', new DomainInputFormField("", TRUE, TRUE), $_GET['edit']);
|
||||
$form = new FormPage("Modification du ServerName", FALSE);
|
||||
$form->addField('domain_servername', new DomainInputFormField("ServerName", TRUE), $params[3]);
|
||||
$form->addField('previous_servername', new DomainInputFormField("", TRUE, TRUE), $params[3]);
|
||||
|
||||
if (!empty($_POST)) {
|
||||
$form->isCurrentPage(TRUE);
|
||||
$form->initFields();
|
||||
|
||||
if ($form->verify(TRUE)) {
|
||||
// TODO: Adapt the script for cluster mode
|
||||
if ($conf['cluster']) {
|
||||
if (is_mcluster_mode()) {
|
||||
// If the user has not yet selected a cluster, redirect-it to home page.
|
||||
if (empty($_SESSION['cluster'])) {
|
||||
http_redirect('/');
|
||||
}
|
||||
$cache = str_replace('%cluster_name%', $_SESSION['cluster'], $conf['cache']);
|
||||
}
|
||||
else {
|
||||
$cache = $conf['cache'];
|
||||
}
|
||||
$bdd = new bdd();
|
||||
$bdd->open($cache);
|
||||
|
||||
$servername = array (
|
||||
'domain' => htmlspecialchars(basename($_SERVER['REDIRECT_URL'])),
|
||||
'servername' => $form->getField('domain_servername')->getValue(),
|
||||
'previous_servername' => $form->getField('previous_servername')->getValue(),
|
||||
);
|
||||
|
||||
$account_name=$servername['domain'];
|
||||
$account = $bdd->get_account($account_name);
|
||||
|
||||
|
||||
if (sizeof($account) == 0)
|
||||
die("Anomalie... Contactez votre administrateur.");
|
||||
|
||||
$master = $bdd->get_server_from_roleid($account['id_master']);
|
||||
$slave = $bdd->get_server_from_roleid($account['id_slave']);
|
||||
|
||||
|
||||
if ( $bdd->is_serveralias( $account_name, $serveralias['alias'] ) == 0 ) {
|
||||
|
||||
/* web-add-cluster addalias */
|
||||
$exec_cmd = 'web-add-cluster.sh add-alias '.$serveralias['domain'].' '.$serveralias['alias'].' '.$master.' '.$slave;
|
||||
sudoexec($exec_cmd, $exec_output, $exec_return);
|
||||
|
||||
|
||||
|
||||
if ($exec_return == 0) {
|
||||
/* Ajout BDD */
|
||||
$bdd->add_serveralias($serveralias);
|
||||
|
||||
domain_add($serveralias['alias'], gethostbyname($master) , false);
|
||||
|
||||
# Si le compte en question est en replication temps
|
||||
# reel, il faut faire un restart manuel de lsyncd
|
||||
# pour prendre en compte le nouveau domaine.
|
||||
if ($account['replication'] == "realtime") {
|
||||
mail('tech@evolix.fr', "[TAF] Redemarrer lsyncd sur $master", wordwrap('killer tous les processus lsyncd lancé par vmail pour le compte '.$account['name'].' et les relancer (cf. la ligne correspondante à ce compte dans la crontab de vmail).\n', 70));
|
||||
}
|
||||
|
||||
print "<center>";
|
||||
printf ('<p>L\'alias %s du domaine %s a bien été créé</p>', $serveralias['alias'], $serveralias['domain']);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
print "</center>";
|
||||
} else {
|
||||
print "<center>";
|
||||
printf ('<p>Echec dans la creation de l\'alias %s du domaine %s</p>', $serveralias['alias'], $serveralias['domain']);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
print "</center>";
|
||||
}
|
||||
} else {
|
||||
print "<center>";
|
||||
printf ('<p>Alias %s du domaine %s deja existant !</p>', $serveralias['alias'], $serveralias['domain']);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
print "</center>";
|
||||
if (!empty($_POST)) {
|
||||
$form->isCurrentPage(TRUE);
|
||||
$form->initFields();
|
||||
|
||||
if ($form->verify(TRUE)) {
|
||||
// TODO: Adapt the script for cluster mode
|
||||
if ($conf['cluster']) {
|
||||
if (is_mcluster_mode()) {
|
||||
// If the user has not yet selected a cluster, redirect-it to home page.
|
||||
if (empty($_SESSION['cluster'])) {
|
||||
http_redirect('/');
|
||||
}
|
||||
$cache = str_replace('%cluster_name%', $_SESSION['cluster'], $conf['cache']);
|
||||
}
|
||||
else {
|
||||
$servername = array (
|
||||
'domain' => htmlspecialchars(basename($_SERVER['REDIRECT_URL'])),
|
||||
'servername' => $form->getField('domain_servername')->getValue(),
|
||||
'previous_servername' => $form->getField('previous_servername')->getValue(),
|
||||
);
|
||||
$cache = $conf['cache'];
|
||||
}
|
||||
$bdd = new bdd();
|
||||
$bdd->open($cache);
|
||||
|
||||
$account_name=$servername['domain'];
|
||||
$servername = array (
|
||||
'domain' => htmlspecialchars(basename($_SERVER['REDIRECT_URL'])),
|
||||
'servername' => $form->getField('domain_servername')->getValue(),
|
||||
'previous_servername' => $form->getField('previous_servername')->getValue(),
|
||||
);
|
||||
|
||||
$is_servername_present = check_occurence_name($servername['servername']);
|
||||
$account_name=$servername['domain'];
|
||||
$account = $bdd->get_account($account_name);
|
||||
|
||||
if (!$is_servername_present) {
|
||||
$exec_cmd = 'web-add.sh update-servername ' . $servername['domain'] . ' ' . $servername['servername'] . ' ' . $servername['previous_servername'];
|
||||
sudoexec($exec_cmd, $exec_output, $exec_return);
|
||||
|
||||
if ($exec_return == 0) {
|
||||
//domain_add($serveralias['alias'], gethostbyname($master) , false); TODO avec l'IP du load balancer
|
||||
print "<center>";
|
||||
printf ('<p>Le ServerName %s a bien été modifié</p>', $servername['servername']);
|
||||
printf ('<p><a href="%s">Retour à la liste des ServerNames</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
print "</center>";
|
||||
}
|
||||
else {
|
||||
print "<center>";
|
||||
printf ('<p>Echec dans la modification du ServerName %s</p>', $servername['servername']);
|
||||
printf ('<p><a href="%s">Retour à la liste des ServerNames</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
print "</center>";
|
||||
}
|
||||
if (sizeof($account) == 0)
|
||||
die("Anomalie... Contactez votre administrateur.");
|
||||
|
||||
$master = $bdd->get_server_from_roleid($account['id_master']);
|
||||
$slave = $bdd->get_server_from_roleid($account['id_slave']);
|
||||
|
||||
|
||||
if ( $bdd->is_serveralias( $account_name, $serveralias['alias'] ) == 0 ) {
|
||||
|
||||
/* web-add-cluster addalias */
|
||||
$exec_cmd = 'web-add-cluster.sh add-alias '.$serveralias['domain'].' '.$serveralias['alias'].' '.$master.' '.$slave;
|
||||
sudoexec($exec_cmd, $exec_output, $exec_return);
|
||||
|
||||
|
||||
|
||||
if ($exec_return == 0) {
|
||||
/* Ajout BDD */
|
||||
$bdd->add_serveralias($serveralias);
|
||||
|
||||
domain_add($serveralias['alias'], gethostbyname($master) , false);
|
||||
|
||||
# Si le compte en question est en replication temps
|
||||
# reel, il faut faire un restart manuel de lsyncd
|
||||
# pour prendre en compte le nouveau domaine.
|
||||
if ($account['replication'] == "realtime") {
|
||||
mail('tech@evolix.fr', "[TAF] Redemarrer lsyncd sur $master", wordwrap('killer tous les processus lsyncd lancé par vmail pour le compte '.$account['name'].' et les relancer (cf. la ligne correspondante à ce compte dans la crontab de vmail).\n', 70));
|
||||
}
|
||||
|
||||
print "<center>";
|
||||
printf ('<p>L\'alias %s du domaine %s a bien été créé</p>', $serveralias['alias'], $serveralias['domain']);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $redirect_url);
|
||||
print "</center>";
|
||||
} else {
|
||||
print "<center>";
|
||||
printf ('<p>Echec dans la creation de l\'alias %s du domaine %s</p>', $serveralias['alias'], $serveralias['domain']);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $redirect_url);
|
||||
print "</center>";
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
print "<center>";
|
||||
printf ('<p>Alias %s du domaine %s deja existant !</p>', $serveralias['alias'], $serveralias['domain']);
|
||||
printf ('<p><a href="%s">Retour à la liste des alias</a></p>', $redirect_url);
|
||||
print "</center>";
|
||||
|
||||
}
|
||||
}
|
||||
else {
|
||||
$servername = array (
|
||||
'domain' => $params[1],
|
||||
'servername' => $form->getField('domain_servername')->getValue(),
|
||||
'previous_servername' => $form->getField('previous_servername')->getValue(),
|
||||
);
|
||||
|
||||
$account_name=$servername['domain'];
|
||||
|
||||
$is_servername_present = check_occurence_name($servername['servername']);
|
||||
|
||||
if (!$is_servername_present) {
|
||||
$exec_cmd = 'web-add.sh update-servername ' . $servername['domain'] . ' ' . $servername['servername'] . ' ' . $servername['previous_servername'];
|
||||
sudoexec($exec_cmd, $exec_output, $exec_return);
|
||||
|
||||
if ($exec_return == 0) {
|
||||
//domain_add($serveralias['alias'], gethostbyname($master) , false); TODO avec l'IP du load balancer
|
||||
print "<center>";
|
||||
printf ('<p>Le ServerName %s a bien été modifié</p>', $servername['servername']);
|
||||
printf ('<p><a href="%s">Retour à la liste des ServerNames</a></p>', $redirect_url);
|
||||
print "</center>";
|
||||
}
|
||||
else {
|
||||
print "<center>";
|
||||
printf ('<p>Echec dans la modification du ServerName %s</p>', $servername['servername']);
|
||||
print ('<p>Le domaine existe déjà dans d\'autres vhosts.');
|
||||
printf ('<p><a href="%s">Retour à la liste des ServerNames</a></p>', $_SERVER['REDIRECT_URL']);
|
||||
printf ('<p><a href="%s">Retour à la liste des ServerNames</a></p>', $redirect_url);
|
||||
print "</center>";
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
print "<center>";
|
||||
printf ('<p>Echec dans la modification du ServerName %s</p>', $servername['servername']);
|
||||
print ('<p>Le domaine existe déjà dans d\'autres vhosts.');
|
||||
printf ('<p><a href="%s">Retour à la liste des ServerNames</a></p>', $redirect_url);
|
||||
print "</center>";
|
||||
}
|
||||
} else {
|
||||
print "<h2>Modification du ServerName</h2><hr>";
|
||||
print "<form name=\"form-add\" id=\"form-add\" action=\"\" method=\"POST\">";
|
||||
print " <fieldset>";
|
||||
print " <legend>Modification du ServerName</legend>";
|
||||
print $form;
|
||||
print " <p><input type=\"submit\" value=\"Modifier\"/></p>";
|
||||
print " </fieldset>";
|
||||
print "</form>";
|
||||
}
|
||||
} else {
|
||||
print "<h2>Modification du ServerName</h2><hr>";
|
||||
|
|
@ -160,8 +154,18 @@ if (isset($_GET['edit']) ) {
|
|||
print " <p><input type=\"submit\" value=\"Modifier\"/></p>";
|
||||
print " </fieldset>";
|
||||
print "</form>";
|
||||
|
||||
}
|
||||
} else {
|
||||
print "<h2>Modification du ServerName</h2><hr>";
|
||||
print "<form name=\"form-add\" id=\"form-add\" action=\"\" method=\"POST\">";
|
||||
print " <fieldset>";
|
||||
print " <legend>Modification du ServerName</legend>";
|
||||
print $form;
|
||||
print " <p><input type=\"submit\" value=\"Modifier\"/></p>";
|
||||
print " </fieldset>";
|
||||
print "</form>";
|
||||
|
||||
}
|
||||
|
||||
include_once EVOADMIN_BASE . '../tpl/footer.tpl.php';
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
printf('<td>%s</td>',
|
||||
$servername_list[$i]);
|
||||
if (is_superadmin())
|
||||
printf('<td><a href="/webadmin/servername/%s?edit=%s">Modifier</a></td>',
|
||||
printf('<td><a href="/webadmin/%s/domain/edit/%s/">Modifier</a></td>',
|
||||
$domain, $servername_list[$i]);
|
||||
print '</tr>';
|
||||
} ?>
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@
|
|||
if (is_superadmin()) {
|
||||
printf('<td>');
|
||||
printf('<a href="/webadmin/edit/%s">Alias</a> - ', $vhost_info['owner']);
|
||||
printf('<a href="/webadmin/servername/%s">Servername</a> - ', $vhost_info['owner']);
|
||||
printf('<a href="/webadmin/%s/domain/">Servername</a> - ', $vhost_info['owner']);
|
||||
if(is_multiphp()) {
|
||||
printf('<a href="/webadmin/php/%s">PHP</a>', $vhost_info['owner']);
|
||||
} else {
|
||||
|
|
|
|||
Loading…
Reference in a new issue