introduce bindadmin var to know if we need deal with DNS stuff

This commit is contained in:
Gregory Colpart 2017-08-20 04:41:44 +02:00
parent 2947fa2c87
commit c5b6db810f
2 changed files with 7 additions and 2 deletions

View file

@ -26,6 +26,7 @@ $oriconf['servers'] = array('servers');
$oriconf['cache'] = '/home/evoadmin/www/cache.sqlite'; $oriconf['cache'] = '/home/evoadmin/www/cache.sqlite';
$oriconf['known_host'] = '/home/evoadmin/www/known_host'; $oriconf['known_host'] = '/home/evoadmin/www/known_host';
$oriconf['ftpadmin'] = FALSE; $oriconf['ftpadmin'] = FALSE;
$oriconf['bindadmin'] = FALSE;
$oriconf['noreplication'] = array('srv00.example.com', 'srv01.example.com', 'srv02.example.com'); $oriconf['noreplication'] = array('srv00.example.com', 'srv01.example.com', 'srv02.example.com');
$oriconf['postponedreplication'] = array('srv00.example.com', 'srv01.example.com', 'srv02.example.com'); $oriconf['postponedreplication'] = array('srv00.example.com', 'srv01.example.com', 'srv02.example.com');

View file

@ -173,6 +173,7 @@ function web_add_cluster($form, $admin_mail) {
$slave, $slave,
($realtime ? 'realtime': 'deferred')); ($realtime ? 'realtime': 'deferred'));
//if ($conf['bindadmin'])
domain_add($form->getField('domain')->getValue(), gethostbyname($master), true, $form->getField('use_gmail_mxs')->getValue()); domain_add($form->getField('domain')->getValue(), gethostbyname($master), true, $form->getField('use_gmail_mxs')->getValue());
sudoexec($exec_cmd, $exec_output, $exec_return); sudoexec($exec_cmd, $exec_output, $exec_return);
@ -199,6 +200,7 @@ function web_add_cluster($form, $admin_mail) {
$account['name'] = $form->getField('username')->getValue(); $account['name'] = $form->getField('username')->getValue();
$account['domain'] = $form->getField('domain')->getValue(); $account['domain'] = $form->getField('domain')->getValue();
//if ($conf['bindadmin'])
if ($form->getField('use_gmail_mxs')->getValue()) if ($form->getField('use_gmail_mxs')->getValue())
$account['mail'] = 'gmail'; $account['mail'] = 'gmail';
else else
@ -332,8 +334,10 @@ if ($conf['cluster']) {
$form->addField('cluster_mode', new SelectFormField('Mode de réplication', FALSE, $choices)); $form->addField('cluster_mode', new SelectFormField('Mode de réplication', FALSE, $choices));
} }
/* Quai13 specific: allow to switch between Gmail MX/Quai13 MX */ if ($conf['bindadmin']) {
$form->addField('use_gmail_mxs', new CheckboxInputFormField("Utilisation des serveurs Gmail en MX ?", FALSE)); /* Quai13 specific: allow to switch between Gmail MX/Quai13 MX */
$form->addField('use_gmail_mxs', new CheckboxInputFormField("Utilisation des serveurs Gmail en MX ?", FALSE));
}
/* Traitement du formulaire */ /* Traitement du formulaire */
if(!empty($_POST)) { if(!empty($_POST)) {