diff --git a/livesupport/modules/storageServer/var/GreenBox.php b/livesupport/modules/storageServer/var/GreenBox.php
index 362463941..7b8f18d73 100644
--- a/livesupport/modules/storageServer/var/GreenBox.php
+++ b/livesupport/modules/storageServer/var/GreenBox.php
@@ -23,7 +23,7 @@
Author : $Author: tomas $
- Version : $Revision: 1.4 $
+ Version : $Revision: 1.5 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/GreenBox.php,v $
------------------------------------------------------------------------------*/
@@ -48,7 +48,7 @@ require_once "Transport.php";
* LiveSupport file storage module
*
* @author $Author: tomas $
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
* @see Alib
*/
class GreenBox extends Alib{
@@ -479,9 +479,6 @@ class GreenBox extends Alib{
$res4 = $tr->getTransportStatus($res2);
# return $res;
return array($res, $res2, $res3, $res4);
-# return PEAR::raiseError(
-# 'GreenBox::uploadFile: not implemented', GBERR_NOTIMPL
-# );
}
/**
@@ -507,9 +504,6 @@ class GreenBox extends Alib{
$res4 = $tr->getTransportStatus($res2);
# return $res;
return array($res, $res2, $res3, $res4);
-# return PEAR::raiseError(
-# 'GreenBox::downloadFile: not implemented', GBERR_NOTIMPL
-# );
}
diff --git a/livesupport/modules/storageServer/var/conf.php b/livesupport/modules/storageServer/var/conf.php
index d09a485d4..8e0e77f9a 100644
--- a/livesupport/modules/storageServer/var/conf.php
+++ b/livesupport/modules/storageServer/var/conf.php
@@ -23,23 +23,60 @@
Author : $Author: tomas $
- Version : $Revision: 1.3 $
+ Version : $Revision: 1.4 $
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/conf.php,v $
------------------------------------------------------------------------------*/
+
+/**
+ * configuration structure:
+ *
+ * - dsn
- datasource setting
+ *
- tblNamePrefix
- prefix for table names in the database
+ *
- authCookieName
- secret token cookie name
+ *
- storageDir
- main directory for storing binary media files
+ *
- bufferDir
- directory for temporary files
+ *
- transDir
- directory for incomplete transferred files
+ *
- accessDir
- directory for symlinks to accessed files
+ *
- storageUrlPath
- path-URL-part of storageServer base dir
+ *
- storageXMLRPC
- XMLRPC server script address relative to storageUrlPath
+ *
- storageUrlHost, storageUrlPort
- host and port of storageServer
+ *
- archiveUrlPath
- path-URL-part of archiveServer base dir
+ *
- archiveXMLRPC
- XMLRPC server script address relative to archiveUrlPath
+ *
- archiveUrlHost, archiveUrlPort
- host and port of archiveServer
+ *
+ */
$config = array(
+ /* ================================================== basic configuration */
'dsn' => array(
'username' => 'test',
'password' => 'test',
'hostspec' => 'localhost',
-# 'hostspec' => '127.0.0.1', // for bad resolver
'phptype' => 'pgsql',
'database' => 'LiveSupport-test',
),
'tblNamePrefix' => 'ls_',
'authCookieName'=> 'lssid',
- 'RootNode' => 'RootNode',
- 'tmpRootPass' => 'q',
+ 'storageDir' => dirname(getcwd()).'/stor',
+ 'bufferDir' => dirname(getcwd()).'/stor/buffer',
+ 'transDir' => dirname(getcwd()).'/trans',
+ 'accessDir' => dirname(getcwd()).'/access',
+
+ /* ==================================================== URL configuration */
+ 'storageUrlPath' => '/livesupport/modules/storageServer/var',
+ 'storageXMLRPC' => 'xmlrpc/xrLocStor.php',
+ 'storageUrlHost' => 'localhost',
+ 'storageUrlPort' => 80,
+
+ /* ================================================ archive configuration */
+ 'archiveUrlPath' => '/livesupport/modules/archiveServer/var',
+ 'archiveXMLRPC' => 'xmlrpc/xrArchive.php',
+ 'archiveUrlHost' => 'localhost',
+ 'archiveUrlPort' => 80,
+ 'archiveAccountLogin' => 'root',
+ 'archiveAccountPass' => 'q',
+
+ /* ==================================== aplication-specific configuration */
'objtypes' => array(
'RootNode' => array('Folder'),
'Storage' => array('Folder', 'File', 'Replica'),
@@ -57,22 +94,9 @@ $config = array(
'allActions' => array(
'editPrivs', 'write', 'read', 'classes', 'subjects'
),
- 'storageDir' => dirname(getcwd()).'/stor',
- 'bufferDir' => dirname(getcwd()).'/stor/buffer',
- 'transDir' => dirname(getcwd()).'/trans',
- 'accessDir' => dirname(getcwd()).'/access',
-
- 'storageUrlPath' => '/livesupport/modules/storageServer/var',
- 'storageXMLRPC' => 'xmlrpc/xrLocStor.php',
- 'storageUrlHost' => 'localhost',
- 'storageUrlPort' => 80,
-
- 'archiveUrlPath' => '/livesupport/modules/archiveServer/var',
- 'archiveXMLRPC' => 'xmlrpc/xrArchive.php',
- 'archiveUrlHost' => 'localhost',
- 'archiveUrlPort' => 80,
- 'archiveAccountLogin' => 'root',
- 'archiveAccountPass' => 'q',
+ /* ============================================== auxiliary configuration */
+ 'RootNode' => 'RootNode',
+ 'tmpRootPass' => 'q',
);
?>
\ No newline at end of file
diff --git a/livesupport/modules/storageServer/var/install/getGname.php b/livesupport/modules/storageServer/var/install/getGname.php
index 33fdc2574..0136b40c2 100644
--- a/livesupport/modules/storageServer/var/install/getGname.php
+++ b/livesupport/modules/storageServer/var/install/getGname.php
@@ -1,6 +1,6 @@
header("Content-type: text/plain");
- $gid = posix_getgid();
+# $gid = posix_getgid();
$egid = posix_getegid();
$info = posix_getgrgid($egid);
echo $info['name'];