Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

partial undo of [3002]

This commit is contained in:
fgerlits 2007-02-19 11:37:14 +00:00
parent fb94c18d86
commit 72016072b4
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
campcaster/src/modules/storageServer/var/Backup.php
View File

@ -337,11 +337,10 @@ class Backup
*/ */
private function doIt() private function doIt()
{ {
global $CC_CONFIG;
if ($this->loglevel=='debug') { if ($this->loglevel=='debug') {
$this->addLogItem("-I- ".date("Ymd-H:i:s")." doIt\n"); $this->addLogItem("-I- ".date("Ymd-H:i:s")." doIt\n");
} }
$command = $CC_CONFIG['storageBinDir']."/backup.sh" $command = dirname(__FILe__)."/../bin/backup.sh"
." {$this->tmpDir}" ." {$this->tmpDir}"
." {$this->tmpFile}" ." {$this->tmpFile}"
." {$this->statusFile}" ." {$this->statusFile}"
@ -489,4 +488,4 @@ class Backup
} }
} // classs Backup } // classs Backup
?> ?>

5
campcaster/src/modules/storageServer/var/Restore.php
View File

@ -82,7 +82,6 @@ class Restore {
*/ */
function openRestore($sessid, $backup_file) function openRestore($sessid, $backup_file)
{ {
global $CC_CONFIG;
if ($this->loglevel=='debug') { if ($this->loglevel=='debug') {
$this->addLogItem("-I-".date("Ymd-H:i:s")." doRestore - sessid:$sessid\n"); $this->addLogItem("-I-".date("Ymd-H:i:s")." doRestore - sessid:$sessid\n");
} }
@ -96,7 +95,7 @@ class Restore {
file_put_contents($this->statusFile, 'working'); file_put_contents($this->statusFile, 'working');
//call the restore script in background //call the restore script in background
$command = $CC_CONFIG['storageBinDir'].'/restore.php'; $command = dirname(__FILE__).'/../bin/restore.php';
$runLog = "/dev/null"; $runLog = "/dev/null";
$params = "{$backup_file} {$this->statusFile} {$this->token} {$sessid}>> $runLog &"; $params = "{$backup_file} {$this->statusFile} {$this->token} {$sessid}>> $runLog &";
$ret = system("$command $params", $st); $ret = system("$command $params", $st);
@ -438,4 +437,4 @@ class Restore {
} }
} // class Restore } // class Restore
?> ?>

3
campcaster/src/modules/storageServer/var/conf.php
View File

@ -58,7 +58,6 @@ $CC_CONFIG = array(
'accessDir' => dirname(__FILE__).'/../../storageServer/var/access', 'accessDir' => dirname(__FILE__).'/../../storageServer/var/access',
'pearPath' => dirname(__FILE__).'/../../../../usr/lib/pear', 'pearPath' => dirname(__FILE__).'/../../../../usr/lib/pear',
'cronDir' => dirname(__FILE__).'/../../storageServer/var/cron', 'cronDir' => dirname(__FILE__).'/../../storageServer/var/cron',
'storageBinDir' => dirname(__FILE__).'/../bin',
'isArchive' => FALSE, 'isArchive' => FALSE,
'validate' => TRUE, 'validate' => TRUE,
'useTrash' => TRUE, 'useTrash' => TRUE,
@ -180,4 +179,4 @@ foreach (array('storageDir', 'bufferDir', 'transDir', 'accessDir', 'pearPath', '
} }
} }
?> ?>

3
campcaster/src/modules/storageServer/var/conf.php.template
View File

@ -59,7 +59,6 @@ $CC_CONFIG = array(
'accessDir' => dirname(__FILE__).'/../../storageServer/var/access', 'accessDir' => dirname(__FILE__).'/../../storageServer/var/access',
'pearPath' => 'ls_lib_dir/pear', 'pearPath' => 'ls_lib_dir/pear',
'cronDir' => dirname(__FILE__).'/../../storageServer/var/cron', 'cronDir' => dirname(__FILE__).'/../../storageServer/var/cron',
'storageBinDir' => dirname(__FILE__).'/../../../../bin',
'isArchive' => FALSE, 'isArchive' => FALSE,
'validate' => TRUE, 'validate' => TRUE,
'useTrash' => TRUE, 'useTrash' => TRUE,
@ -154,4 +153,4 @@ foreach (array('storageDir', 'bufferDir', 'transDir', 'accessDir', 'pearPath', '
$CC_CONFIG[$d] = $rp; $CC_CONFIG[$d] = $rp;
} }
?> ?>