Skip to content

Commit

Permalink
Merge pull request WWBN#6 from WWBN/master
Browse files Browse the repository at this point in the history
up2date
  • Loading branch information
ronaldod authored May 21, 2020
2 parents e934cbc + 83cf2c7 commit 1f47503
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion plugin/CloneSite/cloneClient.json.php
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
} else {
// decrypt the password now
$objClone = Plugin::decryptIfNeed($objClone);
$rsync = "sshpass -p '{password}' rsync -avz -e 'ssh -o StrictHostKeyChecking=no' --exclude '*.php' --exclude 'cache' --exclude '*.sql' --exclude '*.log' {$objClone->cloneSiteSSHUser}@{$objClone->cloneSiteSSHIP}:{$json->videosDir} {$global['systemRootPath']}videos/ --log-file='{$log->file}' ";
$rsync = "sshpass -p '{password}' rsync -av -e 'ssh -o StrictHostKeyChecking=no' --exclude '*.php' --exclude 'cache' --exclude '*.sql' --exclude '*.log' {$objClone->cloneSiteSSHUser}@{$objClone->cloneSiteSSHIP}:{$json->videosDir} {$global['systemRootPath']}videos/ --log-file='{$log->file}' ";
$cmd = str_replace("{password}", $objClone->cloneSiteSSHPassword->value, $rsync);
$log->add("Clone (4 of {$totalSteps}): execute rsync ({$rsync})");

Expand Down
2 changes: 1 addition & 1 deletion plugin/CloneSite/cloneServer.json.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

// get mysql dump
$cmd = "mysqldump -u {$mysqlUser} -p{$mysqlPass} --host {$mysqlHost} {$mysqlDatabase} > {$clonesDir}{$resp->sqlFile}";
_error_log("Clone: Dump {$cmd}");
_error_log("Clone: Dump to {$clonesDir}{$resp->sqlFile}");
exec($cmd." 2>&1", $output, $return_val);
if ($return_val !== 0) {
_error_log("Clone Error: ". print_r($output, true));
Expand Down

0 comments on commit 1f47503

Please sign in to comment.