Description: Change (hardcoded) paths in shell and install scripts to conform to debian locations. Forwarded: not-needed Author: Robin Gareus Last-Update: 2010-02-14 Index: campcaster/src/modules/archiveServer/var/conf.php.template =================================================================== --- campcaster.orig/src/modules/archiveServer/var/conf.php.template 2010-07-22 15:21:30.000000000 +0200 +++ campcaster/src/modules/archiveServer/var/conf.php.template 2010-08-26 14:51:22.000000000 +0200 @@ -3,7 +3,7 @@ * ArchiveServer configuration file */ -include(dirname(__FILE__)."/../../storageServer/var/campcaster_version.php"); +include("/etc/campcaster/storageServer/campcaster_version.php"); /** * configuration structure: @@ -48,10 +48,10 @@ 'AdminsGr' => 'Admins', 'StationPrefsGr'=> '', 'AllGr' => 'All', - 'storageDir' => dirname(__FILE__).'/../../archiveServer/var/stor', - 'bufferDir' => dirname(__FILE__).'/../../archiveServer/var/stor/buffer', - 'transDir' => dirname(__FILE__).'/../../archiveServer/var/trans', - 'accessDir' => dirname(__FILE__).'/../../archiveServer/var/access', + 'storageDir' => 'ls_shr_www/archiveServer/var/stor', + 'bufferDir' => 'ls_shr_www/archiveServer/var/stor/buffer', + 'transDir' => 'ls_shr_www/archiveServer/var/trans', + 'accessDir' => 'ls_shr_www/archiveServer/var/access', 'pearPath' => 'ls_lib_dir/pear', 'isArchive' => TRUE, 'validate' => TRUE, @@ -117,4 +117,4 @@ ); $old_ip = get_include_path(); set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath'].PATH_SEPARATOR.$old_ip); -?> \ No newline at end of file +?> Index: campcaster/src/modules/htmlUI/var/ui_conf.php.template =================================================================== --- campcaster.orig/src/modules/htmlUI/var/ui_conf.php.template 2010-07-22 15:21:30.000000000 +0200 +++ campcaster/src/modules/htmlUI/var/ui_conf.php.template 2010-08-26 14:51:22.000000000 +0200 @@ -152,9 +152,9 @@ ) ); -require_once(dirname(__FILE__).'/ui_base.inc.php'); -require_once('../../../storageServer/var/GreenBox.php'); -require_once(dirname(__FILE__).'/formmask/generic.inc.php'); +require_once('htmlui_dir/ui_base.inc.php'); +require_once('storage_server/var/GreenBox.php'); +require_once('htmlui_dir/formmask/generic.inc.php'); require_once('DB.php'); require_once('HTML/QuickForm.php'); Index: campcaster/src/modules/storageAdmin/bin/campcaster-backup =================================================================== --- campcaster.orig/src/modules/storageAdmin/bin/campcaster-backup 2010-08-26 13:40:02.000000000 +0200 +++ campcaster/src/modules/storageAdmin/bin/campcaster-backup 2010-08-26 14:51:22.000000000 +0200 @@ -36,8 +36,7 @@ then phpdir=`cd $reldir/var; pwd` fi -mkdir -p $reldir/tmp -tmpmaindir=`cd $reldir/tmp; pwd` +tmpmaindir=/tmp dbxml="db.xml" datestr=`date '+%Y%m%d%H%M%S'` xmltar="xmls.tar" Index: campcaster/src/modules/storageAdmin/bin/dumpDbSchema.sh =================================================================== --- campcaster.orig/src/modules/storageAdmin/bin/dumpDbSchema.sh 2010-08-26 13:40:02.000000000 +0200 +++ campcaster/src/modules/storageAdmin/bin/dumpDbSchema.sh 2010-08-26 14:51:22.000000000 +0200 @@ -30,13 +30,7 @@ # Determine directories, files #------------------------------------------------------------------------------- -reldir=`dirname $0`/.. -phpdir=ls_storageAdmin_phppart_dir -if [ "$phpdir" == "ls_storageAdmin_phppart_dir" ] -then - phpdir=`cd $reldir/var; pwd` -fi -filelistpathname=. +phpdir=/usr/share/campcaster/www/storageAdmin/var/ #------------------------------------------------------------------------------- # Print the usage information for this script. Index: campcaster/src/modules/storageServer/var/conf.php.template =================================================================== --- campcaster.orig/src/modules/storageServer/var/conf.php.template 2010-07-22 15:21:30.000000000 +0200 +++ campcaster/src/modules/storageServer/var/conf.php.template 2010-08-26 14:51:22.000000000 +0200 @@ -53,12 +53,12 @@ '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', + 'storageDir' => 'ls_shr_www/storageServer/var/stor', + 'bufferDir' => 'ls_shr_www/storageServer/var/stor/buffer', + 'transDir' => 'ls_shr_www/storageServer/var/trans', + 'accessDir' => 'ls_shr_www/storageServer/var/access', 'pearPath' => 'ls_lib_dir/pear', - 'cronDir' => dirname(__FILE__).'/../../storageServer/var/cron', + 'cronDir' => 'ls_shr_www/storageServer/var/cron', 'isArchive' => FALSE, 'validate' => TRUE, 'useTrash' => TRUE, @@ -113,9 +113,10 @@ /* =================================================== cron configuration */ 'cronUserName' => 'ls_apache_group', - 'lockfile' => dirname(__FILE__).'/cron/cron.lock', - 'cronfile' => dirname(__FILE__).'/cron/croncall.php', - 'paramdir' => dirname(__FILE__).'/cron/params', + 'lockfile' => '/var/lock/campcaster-cron.lock', + 'cronfile' => 'ls_shr_www/storageServer/var/cron/croncall.php', + 'paramdir' => '/var/cache/campcaster/cronparams', + ); // Add database table names Index: campcaster/src/products/scheduler/bin/createOdbcDataSource.sh =================================================================== --- campcaster.orig/src/products/scheduler/bin/createOdbcDataSource.sh 2010-08-26 13:40:02.000000000 +0200 +++ campcaster/src/products/scheduler/bin/createOdbcDataSource.sh 2010-08-26 14:51:22.000000000 +0200 @@ -32,14 +32,7 @@ #------------------------------------------------------------------------------- # Determine directories, files #------------------------------------------------------------------------------- -reldir=`dirname $0`/.. -basedir=`cd $reldir; pwd;` -bindir=$basedir/bin -etcdir=$basedir/etc -docdir=$basedir/doc -tmpdir=$basedir/tmp -usrdir=$basedir/usr - +etcdir=/usr/share/campcaster/etc/ #------------------------------------------------------------------------------- # Print the usage information for this script.