diff --git a/private/common/config.local.php b/private/common/config.local.php index 58e1f71..7246505 100644 --- a/private/common/config.local.php +++ b/private/common/config.local.php @@ -35,6 +35,10 @@ $backupSystem = new stdClass(); $backupSystem->account = "40a911e14db8ad6faf0a0e7385e7c267"; $backupSystem->passphrase = "a54af48c2ec44bba903666b6d12290750178154a6965c9165d3b387e7fd0f14c5f2d62cb93f468be640d469c80f1260feed3ad98f5f52d52c045b0487e59981bf365f4037f6c7cb93572cdd5d20daeb8185afcc65dba1bd2067829f827d9b795451f6e5e8fafe5e1fbe29675feb93e7d208a6b53a14df5aeec62d97fbf34d56a"; +$cbs2 = new stdClass(); +$cbs2->keyfile = "id_rsa_cbs_local"; +$cbs2->serverPort = "22"; + // $config->locations = new stdClass(); // $config->application->applicationInterfacePath = "/tnc15"; diff --git a/private/common/config.php b/private/common/config.php index 0f12af9..94dbe27 100644 --- a/private/common/config.php +++ b/private/common/config.php @@ -95,4 +95,11 @@ $config->api = new stdClass(); $config->api->account = $backupSystem->account; $config->api->passphrase = $backupSystem->passphrase; +// CBS 2 +$config->cbs = new stdClass(); +$config->cbs->keyFile = $config->paths->common . "/" . $cbs2->keyfile; +$config->cbs->serverPort = $cbs2->serverPort; + + + ?> diff --git a/private/common/config.prod.php b/private/common/config.prod.php index e6551ce..4d14487 100644 --- a/private/common/config.prod.php +++ b/private/common/config.prod.php @@ -36,6 +36,10 @@ $backupSystem = new stdClass(); $backupSystem->account = "1582528f056a7ea7f391149fddc75553"; $backupSystem->passphrase = "232728b3e504a400a62a9f94893a9a962ecc6543ed7d3c293340414b259aac727f14d60a4f2cd52e228c9694a55774ff5652520b38d120a299394715247645b8293a880901162f268c8c8777a3ee9c6e410455cb4c8137f58f9d7162d45582ab363679ed456e56bf3b36d0384368b62eced40abd0fe117f04c9322f07ee33a7c"; +$cbs2 = new stdClass(); +$cbs2->keyfile = "id_rsa_cbs_prod"; +$cbs2->serverPort = "50005"; + // $config->locations = new stdClass(); // $config->application->applicationInterfacePath = "/tnc15"; diff --git a/private/common/config.test.php b/private/common/config.test.php index 8ea9d35..6d982a8 100644 --- a/private/common/config.test.php +++ b/private/common/config.test.php @@ -35,7 +35,9 @@ $backupSystem = new stdClass(); $backupSystem->account = "40a911e14db8ad6faf0a0e7385e7c267"; $backupSystem->passphrase = "a54af48c2ec44bba903666b6d12290750178154a6965c9165d3b387e7fd0f14c5f2d62cb93f468be640d469c80f1260feed3ad98f5f52d52c045b0487e59981bf365f4037f6c7cb93572cdd5d20daeb8185afcc65dba1bd2067829f827d9b795451f6e5e8fafe5e1fbe29675feb93e7d208a6b53a14df5aeec62d97fbf34d56a"; - +$cbs2 = new stdClass(); +$cbs2->keyfile = "id_rsa_cbs_test"; +$cbs2->serverPort = "22"; // $config->locations = new stdClass(); diff --git a/private/common/id_rsa_cbs.pub b/private/common/id_rsa_cbs.pub new file mode 100644 index 0000000..c359936 --- /dev/null +++ b/private/common/id_rsa_cbs.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCiuXz8DfvkF0t6/QghqZ77sy/NmncDLWvbcrwxTn4TxFaEr1kJrfrxoDApitkokFS967Ti1d/9th1tvn8o1ivhclUxiOGIrKsW1dJSelEsmmFdjkw7w270UdHsllAVBxmZMpBUU3fvOMl+FGFcOpJqUVf3A86ZPzYfHZPKdrfYd9Qp5q4qw1DF8O1EQM9s28MIgoHYuzyOH9GMpyyBQDo244r64g55oZr4eqVzXfXTTIW/I7+sbux4wa1Hemu+XHJxSIYzVrpyrCi/d+jSXxusL1i149N/Yy8qozTKbdHldovF/IKHyPf1EtfE1swMquw8pme3Aq3MigtsV7Ekvf5pQ6btbpU5HtpkFuSrAQThANiN4saEiLEW6xmVF9/AxHmxYXuaBGRWX5Bky6He5zcNnmK4zpiRKFseJlmBpkxPnSv5bAaXEA6SjRtmwdTjPHqCFspD6knEeNwA4xDr8OAr0KE+/yKkL+bXGwwKGhKHLSub0hYl9t89YkxPgQNMLx52EJ8UmrZMg3aykFMjQ7XnTSFk9FsXf5EV70ZGsVRnSpccZ2SDAbTgRdcJkjoQ28J4R/b9xXnYeMdoQtZclogxOYoVe8U+j8xZfsW0FW5Ek9cQKiMWd6ODmWJ26EDgaEcJMlq2Q8nkTAXb7HCbzW41PUL9VupH/to61haHuwQxrw== fdn2@cbs.asdynamics.com diff --git a/private/common/id_rsa_cbs_prod b/private/common/id_rsa_cbs_prod new file mode 100644 index 0000000..04666be --- /dev/null +++ b/private/common/id_rsa_cbs_prod @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff --git a/private/lib/task/SendBackupTask.php b/private/lib/task/SendBackupTask.php index 503ab99..24381c0 100644 --- a/private/lib/task/SendBackupTask.php +++ b/private/lib/task/SendBackupTask.php @@ -19,12 +19,18 @@ class SendBackupTask extends Task { $backDir = $config->paths->backup."/mongoDump"; SystemController::shellExec("mongodump","-d $dbName -o $backDir"); - $archive = $config->paths->tmp."/backup.tar.gz"; - if (SFSManager::fileExists($archive)){ - SFSManager::deleteFile($archive); - } + $backupKeyFile = $config->cbs2->keyFile; + $backupServerPort = $config->cbs2->serverPort; + $storageDir = $config->paths->storage; - SFSManager::createArchive($config->paths->storage, $archive); + SystemController::shellExec('rsync -avx --rsh="ssh -i '.$backupKeyFile.' -p'.$backupServerPort.'" '.$storageDir.' backupClient@cbs.asdynamics.com:/'); + +// $archive = $config->paths->tmp."/backup.tar.gz"; +// if (SFSManager::fileExists($archive)){ +// SFSManager::deleteFile($archive); +// } + +// SFSManager::createArchive($config->paths->storage, $archive); // GlobalVariables::get("backupClient")->sendBackup("backup_".date("d-m-Y").".tar.gz",$archive); } }