|
|
@@ -390,7 +390,15 @@ jQuery(document).ready(function () {
|
|
|
$outputFormat = 'inc'
|
|
|
)
|
|
|
) . '" > ' . $configPath . '/.cnf--default_ldap-' . $mainServer . '.inc.php';
|
|
|
- // TODO: create .cnf--default_ldap-{$mainServer}.inc.php
|
|
|
+ $cmds[] = ' echo "' . V::quoteBashEcho(
|
|
|
+ Config::generateDefaultFoldersConfigFile(
|
|
|
+ [
|
|
|
+ 'remote_folder_root' => 'biuro_domain_pl',
|
|
|
+ 'server_address' => $mainServer,
|
|
|
+ ],
|
|
|
+ $outputFormat = 'inc'
|
|
|
+ )
|
|
|
+ ) . '" > ' . $configPath . '/.cnf--folders-' . $mainServer . '.inc.php';
|
|
|
|
|
|
$additionalDomains = array_filter($domains, function ($domain) use ($mainServer) {
|
|
|
return ($mainServer != $domain);
|
|
|
@@ -400,7 +408,7 @@ jQuery(document).ready(function () {
|
|
|
$cmds[] = "cd {$configPath} && ln -s .cnf--default_db-{$mainServer}.inc.php .cnf--default_db-{$domain}.inc.php";
|
|
|
$cmds[] = "cd {$configPath} && ln -s .cnf--zasob_2-{$mainServer}.inc.php .cnf--zasob_2-{$domain}.inc.php";
|
|
|
// $cmds[] = "cd {$configPath} && ln -s .cnf--import_db-{$mainServer}.inc.php .cnf--import_db-{$domain}.inc.php";
|
|
|
- // TODO: $cmds[] = "cd {$configPath} && ln -s .cnf--folders-{$mainServer}.inc.php .cnf--folders-{$domain}.inc.php";
|
|
|
+ $cmds[] = "cd {$configPath} && ln -s .cnf--folders-{$mainServer}.inc.php .cnf--folders-{$domain}.inc.php";
|
|
|
$cmds[] = "cd {$configPath} && ln -s .cnf--default_ldap-{$mainServer}.inc.php .cnf--default_ldap-{$domain}.inc.php";
|
|
|
}
|
|
|
|
|
|
@@ -408,7 +416,7 @@ jQuery(document).ready(function () {
|
|
|
foreach ($cmds as $cmd) {
|
|
|
V::exec($cmd, $out, $ret);
|
|
|
if (0 !== $ret) $hasError = true;
|
|
|
- DBG::nicePrint($out, "cmd: `{$cmd}` (return:{$ret})");
|
|
|
+ DBG::nicePrint(array_merge([ "CMD: {$cmd}", "OUTPUT:" ], $out), "cmd: `" . htmlspecialchars(V::strShort($cmd, 20)) . "` (return:{$ret})");
|
|
|
}
|
|
|
if (!$hasError) {
|
|
|
UI::alert('success', "OK");
|
