From 53a3bcb2ee2cff86559a61baaf1ffe72c57a81c1 Mon Sep 17 00:00:00 2001 From: Riccardo Di Dato Date: Thu, 17 Aug 2017 18:30:45 +0200 Subject: [PATCH] Modificato script backup (mongodump con auth) Signed-off-by: Riccardo Di Dato --- private/common/config.local.php | 4 +++- private/common/config.php | 2 +- private/common/config.prod.php | 5 ++++- private/common/config.test.php | 5 ++++- private/lib/task/SendBackupTask.php | 9 +++++++-- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/private/common/config.local.php b/private/common/config.local.php index 7246505..d6b15a1 100644 --- a/private/common/config.local.php +++ b/private/common/config.local.php @@ -12,7 +12,9 @@ Creation Date: 07/gen/2016 // $dbconn->password = "root"; $database = new stdClass(); $database->dbName = "fdn2"; -// $database->connectionString = "mongodb://10.0.0.2:27017"; +$database->user = "test"; +$database->pass = "test"; +$database->useAuth = false; $database->connectionString = "mongodb://127.0.0.1:27017"; $currentSystem = new stdClass(); diff --git a/private/common/config.php b/private/common/config.php index 33c96ca..e19f7b8 100644 --- a/private/common/config.php +++ b/private/common/config.php @@ -100,6 +100,6 @@ $config->cbs2 = new stdClass(); $config->cbs2->keyFile = $config->paths->common . "/" . $cbs2->keyfile; $config->cbs2->serverPort = $cbs2->serverPort; - +$config->database = $database; ?> diff --git a/private/common/config.prod.php b/private/common/config.prod.php index 07bce0c..00461e4 100644 --- a/private/common/config.prod.php +++ b/private/common/config.prod.php @@ -16,7 +16,10 @@ Creation Date: 19/nov/2013 // Password mongo produzione: p14n3ll1FDN2 $database = new stdClass(); $database->dbName = "fdn2"; -$database->connectionString = "mongodb://fdn2:p14n3ll1FDN2@db.ifattidinapoli.it/fdn2"; +$database->user = "fdn2"; +$database->pass = "p14n3ll1FDN2"; +$database->useAuth = true; +$database->connectionString = "mongodb://".$database->user.":".$database->pass."@localhost/".$database->dbname; $currentSystem = new stdClass(); $currentSystem->storageBaseDir = "/home/asdynamics/storage"; // Il path con storage ecc in cui mettere immagini, file temporanei ecc diff --git a/private/common/config.test.php b/private/common/config.test.php index 13d3e8c..237e5f3 100644 --- a/private/common/config.test.php +++ b/private/common/config.test.php @@ -13,7 +13,10 @@ Creation Date: 14/nov/2013 // $dbconn->password = "root"; $database = new stdClass(); $database->dbName = "fdn2"; -$database->connectionString = "mongodb://fdn2:p14n3ll1FDN2@localhost/fdn2"; +$database->user = "test"; +$database->pass = "test"; +$database->useAuth = false; +$database->connectionString = "mongodb://".$database->user.":".$database->pass."@localhost/".$database->dbname; $currentSystem = new stdClass(); $currentSystem->storageBaseDir = "/home"; // Il path con storage ecc in cui mettere immagini, file temporanei ecc diff --git a/private/lib/task/SendBackupTask.php b/private/lib/task/SendBackupTask.php index a16c255..bb8b20d 100644 --- a/private/lib/task/SendBackupTask.php +++ b/private/lib/task/SendBackupTask.php @@ -16,9 +16,14 @@ class SendBackupTask extends Task { public static function execute(){ $config = GlobalVariables::get("config"); - $dbName = GlobalVariables::get("dao")->getDbName(); + $dbName = $config->database->dbName; $backDir = $config->paths->backup."/mongoDump"; - SystemController::shellExec("mongodump","-d $dbName -o $backDir"); + + $mongoDumpOpts = "-d $dbName -o $backDir"; + if ($config->database->useAuth){ + $mongoDumpOpts = "-d $dbName -o $backDir -u ".$config->database->user." -p ".$config->database->pass; + } + SystemController::shellExec("mongodump",$mongoDumpOpts); $backupKeyFile = $config->cbs2->keyFile; $backupServerPort = $config->cbs2->serverPort;