Changeset 2571

Timestamp:

02/01/10 21:12:41 (2 years ago)

Author:

tomdooley

Message:

Bugfix Backup: Database dump not working

Location:

branches/backup-restore/includes

Files:

• BackupPackage.php (modified) (3 diffs)
• boot.php (modified) (1 diff)

branches/backup-restore/includes/BackupPackage.php

@@ -77 +77 @@
                 $result = true;
 
-                foreach ($this->databases as $type => $dbname) {
+                foreach ($this->databases as $type => $dbnames) {
                         // currently only mysql...
                         if ($type == 'mysql') {
-                                if (!$this->dumpMySQLDatabase($dbname)) {
-                                        $result = false;
+                                foreach ($dbnames as $dbname) {
+                                        if (!$this->dumpMySQLDatabase($dbname)) {
+                                                $result = false;
+                                        }
                                 }
                         }
@@ -97 +99 @@
                 $filename = BACKUP_TEMP_PATH.'/'.$dbname.'.sql';
                 $cmd = 'mysqldump --user '.Config::get('DB_USER').' --password='.Config::get('DB_PASS').
-                           ' '.$dbname;
+                           ' '.$dbname.
                            ' >'.$filename;
                 // TODO: Error handling
@@ -114 +116 @@
                 $filename = ARCHIVE_PATH.'/'.$this->domain_name.'.tar.gz';
                 // TODO: only htdocs?
-                $cmd = 'tar czvf -P '.$filename.' '.BACKUP_TEMP_PATH.
+                $cmd = 'tar czvf '.$filename.' '.BACKUP_TEMP_PATH.
                                 ' '.ISPCP_VIRTUAL_PATH.'/'.$this->domain_name.'/htdocs';
                 // TODO: Error handling

branches/backup-restore/includes/boot.php

@@ -9 +9 @@
 require_once dirname(__FILE__).'/utils.php';
 require_once dirname(__FILE__).'/Base.php';
+
+Config::set('DB_TYPE', Config::get('DATABASE_TYPE'));
+Config::set('DB_HOST', Config::get('DATABASE_HOST'));
+Config::set('DB_USER', Config::get('DATABASE_USER'));
+Config::set('DB_PASS', decrypt_db_password(Config::get('DATABASE_PASSWORD')));
+Config::set('DB_NAME', Config::get('DATABASE_NAME'));