Prepared for safe delete.
This commit is contained in:
tomas
parent
5e776c527c
commit
4749cd5c81
4 changed files with 41 additions and 7 deletions
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
|
||||
Author : $Author: tomas $
|
||||
Version : $Revision: 1.13 $
|
||||
Version : $Revision: 1.14 $
|
||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/archiveServer/var/conf.php,v $
|
||||
|
||||
------------------------------------------------------------------------------*/
|
||||
|
|
@ -47,6 +47,9 @@ define('LS_VERSION', '0.9');
|
|||
* <dt>transDir <dd>directory for incomplete transferred files
|
||||
* <dt>accessDir <dd>directory for symlinks to accessed files
|
||||
* <dt>isArchive <dd>local/central flag
|
||||
* <dt>validate <dd>enable/disable validator
|
||||
* <dt>useTrash <dd>enable/disable safe delete (move to trash)
|
||||
* (FALSE on archiveServer)
|
||||
* <dt>storageUrlPath<dd>path-URL-part of storageServer base dir
|
||||
* (on central archive side: storage=archive)
|
||||
* <dt>storageXMLRPC<dd>XMLRPC server script address relative to storageUrlPath
|
||||
|
|
@ -69,6 +72,8 @@ $config = array(
|
|||
'database' => 'LiveSupport-test',
|
||||
),
|
||||
'tblNamePrefix' => 'as_',
|
||||
|
||||
/* ================================================ storage configuration */
|
||||
'authCookieName'=> 'assid',
|
||||
'StationPrefsGr'=> '',
|
||||
'AllGr' => 'All',
|
||||
|
|
@ -78,6 +83,7 @@ $config = array(
|
|||
'accessDir' => dirname(__FILE__).'/../../archiveServer/var/access',
|
||||
'isArchive' => TRUE,
|
||||
'validate' => TRUE,
|
||||
'useTrash' => FALSE,
|
||||
|
||||
/* ==================================================== URL configuration */
|
||||
// on central archive side: archive is the storage !
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@
|
|||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
|
||||
Author : $Author: maroy $
|
||||
Version : $Revision: 1.1 $
|
||||
Author : $Author: tomas $
|
||||
Version : $Revision: 1.2 $
|
||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/archiveServer/var/conf.php.template,v $
|
||||
|
||||
------------------------------------------------------------------------------*/
|
||||
|
|
@ -33,6 +33,8 @@
|
|||
* archiveServer configuration file
|
||||
*/
|
||||
|
||||
define('LS_VERSION', '0.9');
|
||||
|
||||
/**
|
||||
* configuration structure:
|
||||
*
|
||||
|
|
@ -45,6 +47,9 @@
|
|||
* <dt>transDir <dd>directory for incomplete transferred files
|
||||
* <dt>accessDir <dd>directory for symlinks to accessed files
|
||||
* <dt>isArchive <dd>local/central flag
|
||||
* <dt>validate <dd>enable/disable validator
|
||||
* <dt>useTrash <dd>enable/disable safe delete (move to trash)
|
||||
* (FALSE on archiveServer)
|
||||
* <dt>storageUrlPath<dd>path-URL-part of storageServer base dir
|
||||
* (on central archive side: storage=archive)
|
||||
* <dt>storageXMLRPC<dd>XMLRPC server script address relative to storageUrlPath
|
||||
|
|
@ -54,6 +59,9 @@
|
|||
* <dt>archiveUrlHost, archiveUrlPort<dd>host and port of archiveServer
|
||||
* </dl>
|
||||
*/
|
||||
|
||||
// these are the default values for the config
|
||||
|
||||
$config = array(
|
||||
/* ================================================== basic configuration */
|
||||
'dsn' => array(
|
||||
|
|
@ -64,6 +72,8 @@ $config = array(
|
|||
'database' => 'ls_database',
|
||||
),
|
||||
'tblNamePrefix' => 'as_',
|
||||
|
||||
/* ================================================ storage configuration */
|
||||
'authCookieName'=> 'assid',
|
||||
'StationPrefsGr'=> '',
|
||||
'AllGr' => 'All',
|
||||
|
|
@ -73,6 +83,7 @@ $config = array(
|
|||
'accessDir' => dirname(__FILE__).'/../../archiveServer/var/access',
|
||||
'isArchive' => TRUE,
|
||||
'validate' => TRUE,
|
||||
'useTrash' => FALSE,
|
||||
|
||||
/* ==================================================== URL configuration */
|
||||
// on central archive side: archive is the storage !
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
|
||||
Author : $Author: tomas $
|
||||
Version : $Revision: 1.18 $
|
||||
Version : $Revision: 1.19 $
|
||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/conf.php,v $
|
||||
|
||||
------------------------------------------------------------------------------*/
|
||||
|
|
@ -44,12 +44,14 @@ define('LS_VERSION', '0.9');
|
|||
* <dt>authCookieName <dd>secret token cookie name
|
||||
* <dt>StationPrefsGr <dd>name of station preferences group
|
||||
* <dt>AllGr <dd>name of 'all users' group
|
||||
* <dt>TrashName <dd>name of trash folder (subfolder of the storageRoot)
|
||||
* <dt>storageDir <dd>main directory for storing binary media files
|
||||
* <dt>bufferDir <dd>directory for temporary files
|
||||
* <dt>transDir <dd>directory for incomplete transferred files
|
||||
* <dt>accessDir <dd>directory for symlinks to accessed files
|
||||
* <dt>isArchive <dd>local/central flag
|
||||
* <dt>validate <dd>enable/disable validator
|
||||
* <dt>useTrash <dd>enable/disable safe delete (move to trash)
|
||||
* <dt>storageUrlPath<dd>path-URL-part of storageServer base dir
|
||||
* <dt>storageXMLRPC<dd>XMLRPC server script address relative to storageUrlPath
|
||||
* <dt>storageUrlHost, storageUrlPort<dd>host and port of storageServer
|
||||
|
|
@ -73,15 +75,19 @@ $config = array(
|
|||
'database' => 'LiveSupport-test',
|
||||
),
|
||||
'tblNamePrefix' => 'ls_',
|
||||
|
||||
/* ================================================ storage configuration */
|
||||
'authCookieName'=> 'lssid',
|
||||
'StationPrefsGr'=> 'StationPrefs',
|
||||
'AllGr' => 'All',
|
||||
'TrashName' => '.trash',
|
||||
'storageDir' => dirname(__FILE__).'/../../storageServer/var/stor',
|
||||
'bufferDir' => dirname(__FILE__).'/../../storageServer/var/stor/buffer',
|
||||
'transDir' => dirname(__FILE__).'/../../storageServer/var/trans',
|
||||
'accessDir' => dirname(__FILE__).'/../../storageServer/var/access',
|
||||
'isArchive' => FALSE,
|
||||
'validate' => TRUE,
|
||||
'useTrash' => TRUE,
|
||||
|
||||
/* ==================================================== URL configuration */
|
||||
'storageUrlPath' => '/livesupportStorageServer',
|
||||
|
|
@ -131,7 +137,7 @@ $config = array(
|
|||
'tmpRootPass' => 'q',
|
||||
);
|
||||
|
||||
// see if a ~/.livesupport/archiveServer.conf.php exists, and
|
||||
// see if a ~/.livesupport/storageServer.conf.php exists, and
|
||||
// overwrite the settings from there if any
|
||||
|
||||
$this_file = null;
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@
|
|||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
|
||||
Author : $Author: maroy $
|
||||
Version : $Revision: 1.1 $
|
||||
Author : $Author: tomas $
|
||||
Version : $Revision: 1.2 $
|
||||
Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageServer/var/conf.php.template,v $
|
||||
|
||||
------------------------------------------------------------------------------*/
|
||||
|
|
@ -33,6 +33,8 @@
|
|||
* storageServer configuration file
|
||||
*/
|
||||
|
||||
define('LS_VERSION', '0.9');
|
||||
|
||||
/**
|
||||
* configuration structure:
|
||||
*
|
||||
|
|
@ -42,12 +44,14 @@
|
|||
* <dt>authCookieName <dd>secret token cookie name
|
||||
* <dt>StationPrefsGr <dd>name of station preferences group
|
||||
* <dt>AllGr <dd>name of 'all users' group
|
||||
* <dt>TrashName <dd>name of trash folder (subfolder of the storageRoot)
|
||||
* <dt>storageDir <dd>main directory for storing binary media files
|
||||
* <dt>bufferDir <dd>directory for temporary files
|
||||
* <dt>transDir <dd>directory for incomplete transferred files
|
||||
* <dt>accessDir <dd>directory for symlinks to accessed files
|
||||
* <dt>isArchive <dd>local/central flag
|
||||
* <dt>validate <dd>enable/disable validator
|
||||
* <dt>useTrash <dd>enable/disable safe delete (move to trash)
|
||||
* <dt>storageUrlPath<dd>path-URL-part of storageServer base dir
|
||||
* <dt>storageXMLRPC<dd>XMLRPC server script address relative to storageUrlPath
|
||||
* <dt>storageUrlHost, storageUrlPort<dd>host and port of storageServer
|
||||
|
|
@ -58,6 +62,9 @@
|
|||
* for login to archive
|
||||
* </dl>
|
||||
*/
|
||||
|
||||
// these are the default values for the config
|
||||
|
||||
$config = array(
|
||||
/* ================================================== basic configuration */
|
||||
'dsn' => array(
|
||||
|
|
@ -68,15 +75,19 @@ $config = array(
|
|||
'database' => 'ls_database',
|
||||
),
|
||||
'tblNamePrefix' => 'ls_',
|
||||
|
||||
/* ================================================ storage configuration */
|
||||
'authCookieName'=> 'lssid',
|
||||
'StationPrefsGr'=> 'StationPrefs',
|
||||
'AllGr' => 'All',
|
||||
'TrashName' => '.trash',
|
||||
'storageDir' => dirname(__FILE__).'/../../storageServer/var/stor',
|
||||
'bufferDir' => dirname(__FILE__).'/../../storageServer/var/stor/buffer',
|
||||
'transDir' => dirname(__FILE__).'/../../storageServer/var/trans',
|
||||
'accessDir' => dirname(__FILE__).'/../../storageServer/var/access',
|
||||
'isArchive' => FALSE,
|
||||
'validate' => TRUE,
|
||||
'useTrash' => TRUE,
|
||||
|
||||
/* ==================================================== URL configuration */
|
||||
'storageUrlPath' => 'ls_storageUrlPath',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue