diff --git a/bin/postInstallStation.sh b/bin/postInstallStation.sh index c72c1b2..b5f75a1 100755 --- a/bin/postInstallStation.sh +++ b/bin/postInstallStation.sh @@ -36,14 +36,6 @@ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# Determine directories, files -#------------------------------------------------------------------------------- -reldir=`dirname $0`/.. -basedir=`cd $reldir; pwd;` -bindir=$basedir/bin - - -#------------------------------------------------------------------------------- # Print the usage information for this script. #------------------------------------------------------------------------------- printUsage() @@ -186,12 +178,11 @@ ls_database=$database postgres_user=postgres install_bin=$installdir/bin -install_etc=$installdir/etc -install_lib=$installdir/lib -install_usr=$installdir/usr -install_var=$installdir/var -install_var_ls=$install_var/Campcaster - +install_etc=/etc +install_shr=/usr/share/campcaster/www/ +install_tpl=/usr/share/campcaster/etc/ +install_var_ls=/var/lib/campcaster/ +storagedir=$install_var_ls/storageServer #------------------------------------------------------------------------------- # Function to check for the existence of an executable on the PATH @@ -248,23 +239,22 @@ rm -f $group_tmp_file; #------------------------------------------------------------------------------- # Install the new pg_hba.conf file #------------------------------------------------------------------------------- -echo "Modifying postgresql access permissions..."; - -pg_config_dir=$postgresql_dir -pg_config_file=pg_hba.conf -pg_config_file_saved=pg_hba.conf.before-campcaster - -if [ -f $pg_config_dir/$pg_config_file ] ; then - mv -f $pg_config_dir/$pg_config_file $pg_config_dir/$pg_config_file_saved ; -fi -cp $install_etc/$pg_config_file $pg_config_dir/$pg_config_file -chown root:$postgres_user $pg_config_dir/$pg_config_file - -# don't use restart for the init script, as it might return prematurely -# and in the later call to psql we wouldn't be able to connect -${postgresql_init_script} stop -${postgresql_init_script} start - +#echo "Modifying postgresql access permissions..."; +# +#pg_config_dir=$postgresql_dir +#pg_config_file=pg_hba.conf +#pg_config_file_saved=pg_hba.conf.before-campcaster +# +#if [ -f $pg_config_dir/$pg_config_file ] ; then +# mv -f $pg_config_dir/$pg_config_file $pg_config_dir/$pg_config_file_saved ; +#fi +#cp $install_tpl/$pg_config_file $pg_config_dir/$pg_config_file +#chown root:$postgres_user $pg_config_dir/$pg_config_file +# +## don't use restart for the init script, as it might return prematurely +## and in the later call to psql we wouldn't be able to connect +#${postgresql_init_script} stop +#${postgresql_init_script} start #------------------------------------------------------------------------------- # Create the necessary database user and database itself @@ -286,7 +276,6 @@ ${install_bin}/createOdbcDataSource.sh --database=${ls_database} \ # Check whether the storage server directory has been replaced with a mount # point for an NFS share. #------------------------------------------------------------------------------- -storagedir=$installdir/var/storageServer storage_is_local=yes if [ "`mount | grep -o \"on $storagedir \"`" = "on $storagedir " ]; then storage_is_local=no @@ -296,6 +285,32 @@ fi #------------------------------------------------------------------------------- # Setup directory permissions #------------------------------------------------------------------------------- +echo "Setting up var directories..." + +linkvardir() +{ + mkdir -p $install_var_ls/$1 + test -L $install_shr/$1 || (\ + ls $install_shr/$1/* &>/dev/null && \ + cp -af $install_shr/$1/* $install_var_ls/$1/ ) + rm -rf $install_shr/$1 + ln -fs $install_var_ls/$1 $install_shr/$1 +} + +linkvardir archiveServer/var/stor +linkvardir archiveServer/var/access +linkvardir archiveServer/var/trans + +linkvardir storageServer/var/stor +linkvardir storageServer/var/access +linkvardir storageServer/var/trans + +linkvardir htmlUI/var/templates_c +linkvardir htmlUI/var/html/img + +mkdir -p $install_var_ls/archiveServer/var/stor/buffer +mkdir -p $install_var_ls/storageServer/var/stor/buffer + echo "Setting up directory permissions..." chgrp $apache_group $install_var_ls/archiveServer/var/stor @@ -340,7 +355,7 @@ do if [ -d $APACHE_DDIR ]; then echo "Y" AP_DDIR_FOUND=yes - cp $basedir/etc/apache/$CONFFILE $APACHE_DDIR + cp $install_tpl/$CONFFILE $APACHE_DDIR break else echo "N" @@ -350,7 +365,7 @@ if [ "$AP_DDIR_FOUND" != "yes" ]; then echo "###############################" echo " Could not configure Apache" echo " include following file into apache config manually:" - echo " $basedir/etc/apache/$CONFFILE" + echo " $install_tpl/etc/apache/$CONFFILE" echo "###############################" fi echo "done" @@ -383,8 +398,9 @@ echo "done" echo "Creating symlinks..."; # create symlink for the PHP pages in apache's document root -rm -f $www_root/campcaster -ln -s $install_var_ls $www_root/campcaster +# skip this -> done via apache-config +#rm -f $www_root/campcaster +#ln -s $install_var_ls $www_root/campcaster #------------------------------------------------------------------------------- @@ -394,7 +410,7 @@ echo "Initializing database..."; if [ "$storage_is_local" = "yes" ]; then # create PHP-related database tables - cd $install_var_ls/storageServer/var/install + cd $install_shr/storageServer/var/install # workaround for #2059; restore to "exit 1" after the ticket is closed php -q install.php || exit 1; #php -q install.php || true @@ -402,7 +418,7 @@ if [ "$storage_is_local" = "yes" ]; then fi # create PHP-related database tables -cd $install_var_ls/archiveServer/var/install +cd $install_shr/archiveServer/var/install # workaround for ticket #2059; restore to "exit 1" after the ticket is closed php -q install.php || exit 1; #php -q install.php || true @@ -421,7 +437,7 @@ if [ "$storage_is_local" = "yes" ]; then grep -q 'ls_scheduler_storage_pass' $install_etc/campcaster-scheduler.xml if [ $? = 0 ]; then SCHEDULER_STORAGE_PASS=`pwgen -N1 -c -n -s` - php -q $install_var_ls/storageServer/var/install/campcaster-user.php \ + php -q $install_shr/storageServer/var/install/campcaster-user.php \ --addupdate scheduler ${SCHEDULER_STORAGE_PASS} sed -i -e "s/ls_scheduler_storage_pass/${SCHEDULER_STORAGE_PASS}/" \ $install_etc/campcaster-scheduler.xml @@ -433,7 +449,7 @@ fi # Update the database, if necessary #------------------------------------------------------------------------------- if [ "$storage_is_local" = "yes" ]; then - php -q $install_var_ls/storageServer/var/install/upgrade/upgrade.php + php -q $install_shr/storageServer/var/install/upgrade/upgrade.php fi diff --git a/etc/Makefile.in b/etc/Makefile.in index 14b81ca..b0a6270 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -56,7 +56,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ USR_DIR = ${prefix} USR_BIN_DIR = ${USR_DIR}/bin -USR_DOC_DIR = ${USR_DIR}/doc +USR_DOC_DIR = ${USR_DIR}/share/doc/campcaster USR_ETC_DIR = ${USR_DIR}/etc USR_LIB_DIR = ${USR_DIR}/lib USR_VAR_DIR = ${USR_DIR}/var @@ -66,7 +66,7 @@ APACHE_GROUP = @APACHE_GROUP@ WWW_DOCROOT = @WWW_DOCROOT@ WWW_PORT = @WWW_PORT@ SCHEDULER_PORT = @SCHEDULER_PORT@ -DB_SERVER = @DB_SERVER@ +DB_SERVER = @DB_SERVER@ DATABASE = @DATABASE@ DB_USER = @DB_USER@ DB_PASSWORD = @DB_PASSWORD@ @@ -241,10 +241,10 @@ ${TMP_DIR}/modules_setup.stamp: --with-apache-group=${APACHE_GROUP} \ --with-www-docroot=${WWW_DOCROOT} \ --with-configure-apache=${CONFIGURE_APACHE} \ - --with-storage-server=${prefix}/var/Campcaster/storageServer \ + --with-storage-server=/usr/share/campcaster/www/storageServer \ PACKAGE_VERSION=${PACKAGE_VERSION} cd ${STORAGE_ADMIN_DIR} && ./configure --prefix=${prefix} \ - --with-storage-server=${prefix}/var/Campcaster/storageServer \ + --with-storage-server=/usr/share/campcaster/www/storageServer \ --with-phppart-dir=${prefix}/var/Campcaster/storageAdmin \ PACKAGE_VERSION=${PACKAGE_VERSION} cd ${STORAGE_SERVER_DIR} && \ diff --git a/etc/apache/90_php_campcaster.conf b/etc/apache/90_php_campcaster.conf index eeb3588..8e42000 100644 --- a/etc/apache/90_php_campcaster.conf +++ b/etc/apache/90_php_campcaster.conf @@ -1,2 +1,8 @@ php_value upload_max_filesize 32M php_value post_max_size 36M + +Alias /campcaster /usr/share/campcaster/www + + + Options FollowSymlinks + diff --git a/etc/debian/README.Debian b/etc/debian/README.Debian deleted file mode 100644 index 0bf121b..0000000 --- a/etc/debian/README.Debian +++ /dev/null @@ -1,16 +0,0 @@ -campcaster for Ubuntu ---------------------- - -LiveSupport has been renamed to Campcaster, and the target distribution -is now Ubuntu. - - -- Ferenc Gerlits , Thu, 16 Nov 2006 12:00:27 +0100 - - -livesupport for Debian ----------------------- - -First debian package of LiveSupport. - - -- Akos Maroy , Wed, 03 Aug 2005 08:17:25 -0400 - diff --git a/etc/debian/campcaster-station.conffiles b/etc/debian/campcaster-station.conffiles deleted file mode 100644 index fff0438..0000000 --- a/etc/debian/campcaster-station.conffiles +++ /dev/null @@ -1,3 +0,0 @@ -/opt/campcaster/var/Campcaster/storageServer/var/conf.php -/opt/campcaster/var/Campcaster/archiveServer/var/conf.php -/opt/campcaster/etc/campcaster-scheduler.xml diff --git a/etc/debian/campcaster-station.postinst b/etc/debian/campcaster-station.postinst deleted file mode 100644 index e6fade0..0000000 --- a/etc/debian/campcaster-station.postinst +++ /dev/null @@ -1,76 +0,0 @@ -#! /bin/sh -# postinst script for livesupport -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package -# - -installdir=/opt/campcaster -apache_docroot=/var/www -apache_group=www-data - -if [ -d /etc/postgresql/8.1 ]; then - postgresql_dir=/etc/postgresql/8.1/main - postgresql_init_script=/etc/init.d/postgresql-8.1 -elif [ -d /etc/postgresql/8.2 ]; then - postgresql_dir=/etc/postgresql/8.2/main - postgresql_init_script=/etc/init.d/postgresql-8.2 -elif [ -d /etc/postgresql/8.3 ]; then - postgresql_dir=/etc/postgresql/8.3/main - postgresql_init_script=/etc/init.d/postgresql-8.3 -else - echo "no postgresql 8.1, 8.2 or 8.3 found" >&2 - exit 1 -fi - -case "$1" in - configure) - # do post-installation configuration - $installdir/bin/postInstallStation.sh --directory=$installdir \ - --apache-group=$apache_group \ - --postgresql-dir=$postgresql_dir \ - --postgresql-init-script=$postgresql_init_script - - # remount the NFS share if we have a 2-computer setup - if [ -f $installdir/storageServer.wasMounted ]; then - echo "Remounting the remote storage..." - mount $installdir/var/Campcaster/storageServer - rm $installdir/storageServer.wasMounted - fi - - # register and start the Campcaster scheduler daemon - cp -f $installdir/etc/campcaster-scheduler /etc/init.d - update-rc.d campcaster-scheduler defaults 92 || true - /etc/init.d/campcaster-scheduler start || true - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/etc/debian/campcaster-station.postrm b/etc/debian/campcaster-station.postrm deleted file mode 100644 index a44530c..0000000 --- a/etc/debian/campcaster-station.postrm +++ /dev/null @@ -1,95 +0,0 @@ -#! /bin/sh -# postrm script for campcaster -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' overwrit>r> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -installdir=/opt/campcaster - -if [ -d /etc/postgresql/8.1 ]; then - postgresql_dir=/etc/postgresql/8.1/main - postgresql_init_script=/etc/init.d/postgresql-8.1 -elif [ -d /etc/postgresql/8.2 ]; then - postgresql_dir=/etc/postgresql/8.2/main - postgresql_init_script=/etc/init.d/postgresql-8.2 -elif [ -d /etc/postgresql/8.3 ]; then - postgresql_dir=/etc/postgresql/8.3/main - postgresql_init_script=/etc/init.d/postgresql-8.3 -else - echo "no postgresql 8.1, 8.2 or 8.3 found" >&2 - exit 1 -fi -postgres_user=postgres - -ls_database=Campcaster -ls_dbuser=campcaster - - -#------------------------------------------------------------------------------- -# Function to check for the existence of an executable on the PATH -# -# @param $1 the name of the exectuable -# @return 0 if the executable exists on the PATH, non-0 otherwise -#------------------------------------------------------------------------------- -check_exe() { - if [ -x "`which $1 2> /dev/null`" ]; then - return 0; - else - return 1; - fi -} - - -case "$1" in - remove|upgrade|failed-upgrade|abort-install|abort-upgrade) - ;; - - purge|disappear) - # check for the required tools - check_exe "psql" || psql_found=no - - if [ "x$psql_found" != "xno" ] ; then - # kill open connections to the Campcaster database - $postgresql_init_script stop - $postgresql_init_script start - - # remove the PostgreSQL database and user - su - $postgres_user -c \ - "echo \"DROP DATABASE \\\"$ls_database\\\" \" | psql template1" \ - || echo "Couldn't drop database $ls_database."; - su - $postgres_user -c \ - "echo \"DROP USER $ls_dbuser \" | psql template1" \ - || echo "Couldn't drop database user $ls_dbuser."; - fi - - # remove generated files - rm -rf $installdir/var/Campcaster/archiveServer/var/stor/* - rm -rf $installdir/var/Campcaster/storageServer/var/stor/* - rm -f $installdir/storageServer.wasMounted - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/etc/debian/campcaster-station.preinst b/etc/debian/campcaster-station.preinst deleted file mode 100644 index 8c4e360..0000000 --- a/etc/debian/campcaster-station.preinst +++ /dev/null @@ -1,43 +0,0 @@ -#! /bin/sh -# preinst script for livesupport -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -case "$1" in - install) - ;; - - upgrade) - # stop the Campcaster scheduler daemon - /etc/init.d/campcaster-scheduler stop || true - /etc/init.d/campcaster-scheduler kill || true - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/etc/debian/campcaster-station.prerm b/etc/debian/campcaster-station.prerm deleted file mode 100644 index 6054be8..0000000 --- a/etc/debian/campcaster-station.prerm +++ /dev/null @@ -1,118 +0,0 @@ -#! /bin/sh -# prerm script for livesupport -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -installdir=/opt/campcaster -apache_docroot=/var/www -apache_group=www-data - -if [ -d /etc/postgresql/8.1 ]; then - postgresql_dir=/etc/postgresql/8.1/main - postgresql_init_script=/etc/init.d/postgresql-8.1 -elif [ -d /etc/postgresql/8.2 ]; then - postgresql_dir=/etc/postgresql/8.2/main - postgresql_init_script=/etc/init.d/postgresql-8.2 -elif [ -d /etc/postgresql/8.3 ]; then - postgresql_dir=/etc/postgresql/8.3/main - postgresql_init_script=/etc/init.d/postgresql-8.3 -else - echo "no postgresql 8.1, 8.2 or 8.3 found" >&2 - exit 1 -fi - -ls_database=Campcaster -ls_dbuser=campcaster - - -#------------------------------------------------------------------------------- -# Function to check for the existence of an executable on the PATH -# -# @param $1 the name of the exectuable -# @return 0 if the executable exists on the PATH, non-0 otherwise -#------------------------------------------------------------------------------- -check_exe() { - if [ -x "`which $1 2> /dev/null`" ]; then - return 0; - else - return 1; - fi -} - - -case "$1" in - remove|upgrade|deconfigure) - # unmount the NFS share, if we have a 2-computer setup - storagedir=$installdir/var/Campcaster/storageServer - if [ "`mount | grep -o \"on $storagedir \"`" = "on $storagedir " ]; then - echo "Unmounting the remote storage..." - umount $storagedir - touch $installdir/storageServer.wasMounted - fi - - # stop the livesupport scheduler daemon - /etc/init.d/campcaster-scheduler stop || true - /etc/init.d/campcaster-scheduler kill || true - - # remove the init script - rm -f /etc/init.d/campcaster-scheduler - update-rc.d campcaster-scheduler remove || true - - # remove the ODBC data source and driver - check_exe "odbcinst" || odbcinst_found=no - - if [ "x$odbcinst_found" != "xno" ] ; then - odbcinst -u -s -l -n $ls_database - odbcinst -u -d -n PostgreSQL_Campcaster - fi - - # remove the symlink to the campcaster web pages - rm -f $apache_docroot/campcaster - - # restore the old pg_hba.conf file - if [ -f $postgresql_dir/pg_hba.conf ] \ - && [ -f $postgresql_dir/pg_hba.conf.before-campcaster ] ; then - mv -f $postgresql_dir/pg_hba.conf.before-campcaster \ - $postgresql_dir/pg_hba.conf ; - fi - - # remove generated files - rm -rf $installdir/etc/pear.conf - rm -rf $installdir/var/Campcaster/htmlUI/var/html/img/* - rm -rf $installdir/var/Campcaster/htmlUI/var/templates_c/* - rm -rf $installdir/var/Campcaster/archiveServer/var/access/* - rm -rf $installdir/var/Campcaster/archiveServer/var/trans/* - rm -rf $installdir/var/Campcaster/storageServer/var/access/* - rm -rf $installdir/var/Campcaster/storageServer/var/trans/* - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/etc/debian/campcaster-studio.conffiles b/etc/debian/campcaster-studio.conffiles deleted file mode 100644 index c02f4f4..0000000 --- a/etc/debian/campcaster-studio.conffiles +++ /dev/null @@ -1 +0,0 @@ -/opt/campcaster/etc/campcaster-studio.xml diff --git a/etc/debian/campcaster-studio.desktop b/etc/debian/campcaster-studio.desktop deleted file mode 100644 index 024d55b..0000000 --- a/etc/debian/campcaster-studio.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 - -Name=Campcaster-Studio -GenericName=Campcaster Studio GUI Client -Comment=Control your radio station -Icon=/opt/campcaster/var/Campcaster/icon48.png - -Type=Application -Categories=Application;AudioVideo;Audio; - -Exec=/opt/campcaster/bin/campcaster-studio.sh -Terminal=false - diff --git a/etc/debian/campcaster-studio.menu b/etc/debian/campcaster-studio.menu deleted file mode 100644 index 95b2ff6..0000000 --- a/etc/debian/campcaster-studio.menu +++ /dev/null @@ -1,4 +0,0 @@ -?package(campcaster-studio):needs="X11" section="Apps/Sound" \ - title="Campcaster-Studio" command="/opt/campcaster/bin/campcaster-studio.sh" \ - comment="Control your radio station" \ - icon="/opt/campcaster/var/Campcaster/icon48.png" diff --git a/etc/debian/campcaster-studio.postinst b/etc/debian/campcaster-studio.postinst deleted file mode 100644 index a0cdd33..0000000 --- a/etc/debian/campcaster-studio.postinst +++ /dev/null @@ -1,42 +0,0 @@ -#! /bin/sh -# postinst script for livesupport -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package -# - -case "$1" in - configure) - - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/etc/debian/campcaster-studio.postrm b/etc/debian/campcaster-studio.postrm deleted file mode 100644 index 4bc7433..0000000 --- a/etc/debian/campcaster-studio.postrm +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/sh -# postrm script for campcaster -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' overwrit>r> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -case "$1" in - remove|upgrade|failed-upgrade|abort-install|abort-upgrade) - ;; - - purge|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/etc/debian/campcaster-studio.preinst b/etc/debian/campcaster-studio.preinst deleted file mode 100644 index 24ab448..0000000 --- a/etc/debian/campcaster-studio.preinst +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/sh -# preinst script for livesupport -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -case "$1" in - install) - ;; - - upgrade) - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/etc/debian/campcaster-studio.prerm b/etc/debian/campcaster-studio.prerm deleted file mode 100644 index 46d37d0..0000000 --- a/etc/debian/campcaster-studio.prerm +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh -# prerm script for livesupport -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - -case "$1" in - remove|upgrade|deconfigure) - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - diff --git a/etc/debian/changelog b/etc/debian/changelog deleted file mode 100644 index 0638559..0000000 --- a/etc/debian/changelog +++ /dev/null @@ -1,97 +0,0 @@ -campcaster (1.4.0-1) lucid; urgency=low - - * 1.4.0 release - - -- Robin Gareus Fri 05 Feb 2010 02:56:27 +0100 - - -campcaster (1.3.0-1) dapper; urgency=low - - * 1.3.0 release - - -- Ferenc Gerlits Wed, 31 Oct 2007 11:45:50 +0100 - - -campcaster (1.2.0-1) dapper; urgency=low - - * 1.2.0 release - - -- Ferenc Gerlits Mon, 19 Feb 2007 16:01:25 +0100 - - -campcaster (1.1.1-2) dapper; urgency=low - - * 1.1.1 final release, corrected packages - - -- Ferenc Gerlits Mon, 11 Dec 2006 21:25:39 +0000 - - -campcaster (1.1.1-1) dapper; urgency=low - - * 1.1.1 final release - - -- Ferenc Gerlits Wed, 06 Dec 2006 22:19:07 +0100 - - -campcaster (1.1.0-1) dapper; urgency=low - - * 1.1.0 final release - - -- Ferenc Gerlits Fri, 01 Dec 2006 12:57:51 +0100 - - -campcaster (1.1.0rc1-1) unstable; urgency=low - - * 1.1.0 first release candidate - - -- Ferenc Gerlits Thu, 16 Nov 2006 12:00:27 +0100 - - -livesupport (1.1b1-1) unstable; urgency=low - - * 1.1 beta release - - -- Ferenc Gerlits Mon, 04 Sep 2006 13:50:24 +0200 - - -livesupport (1.0.2-1) unstable; urgency=low - - * 1.0.2 bugfix release - - -- Akos Maroy Sun, 13 Nov 2005 15:10:09 +0200 - - -livesupport (1.0.1-1) unstable; urgency=low - - * 1.0.1 bugfix release - - -- Akos Maroy Sat, 01 Oct 2005 17:19:29 +0200 - - -livesupport (1.0-1) unstable; urgency=low - - * 1.0 final release - - -- Akos Maroy Fri, 09 Sep 2005 15:04:13 +0200 - - -livesupport (1.0rc2-1) unstable; urgency=low - - * second release candidate - - -- Akos Maroy Wed, 03 Aug 2005 08:17:25 -0400 - - -livesupport (1.0rc1-1) unstable; urgency=low - - * first release candidate - - -- Akos Maroy Mon, 04 Jul 2005 14:39:11 +0200 - - -livesupport (0.9.1-1) unstable; urgency=low - - * Initial Release. - - -- Akos Maroy Tue, 19 Apr 2005 07:40:13 -0400 - diff --git a/etc/debian/compat b/etc/debian/compat deleted file mode 100644 index b8626c4..0000000 --- a/etc/debian/compat +++ /dev/null @@ -1 +0,0 @@ -4 diff --git a/etc/debian/control b/etc/debian/control deleted file mode 100644 index 0b1663a..0000000 --- a/etc/debian/control +++ /dev/null @@ -1,181 +0,0 @@ -Source: campcaster -Section: sound -Priority: optional -Maintainer: ls_maintainer -Build-Depends: debhelper (>= 4.0.0), - binutils (>= 2.13), - gcc (>= 3.3), - g++ (>= 3.3), - libc6-dev, - make (>= 3.80), - automake1.8 | automake (>= 1.8), - autoconf (>= 2.59), - libtool, - pkg-config (>= 0.15), - patch (>= 2.5.9), - doxygen, - tar, - gzip, - unzip, - bzip2, - curl, - graphviz, - xsltproc, - unixodbc-dev (>= 2.2), - odbc-postgresql, - fontconfig, - libfontconfig1-dev, - libpng12-dev, - libjpeg62-dev, - openssl, - libssl-dev, - libxml2-dev, - libpopt-dev, - alsa-base, - libasound2-dev, - libid3tag0-dev, - libmad0-dev, - libogg-dev, - libvorbis-dev, - libbz2-dev, - libtar-dev (>= 1.2.11), - libcurl3-dev (>= 7.12.3) | libcurl4-openssl-dev (>= 7.16.4), - libboost-date-time-dev (>= 1.33.1), - libgtk2.0-dev (>= 2.6.10), - libgtkmm-2.4-dev (>= 1:2.6.5), - libglademm-2.4-dev (>= 2.6.2), - libxml++2.6-dev (>= 2.8.1), - libicu34-dev | libicu36-dev | libicu-dev, - apache2, - php5-pgsql, - libapache2-mod-php5, - php-pear, - php5-gd, - postgresql-8.1 | postgresql-8.2 | postgresql-8.3 | postgresql (>= 8.1), - postgresql-client-8.1 | postgresql-client-8.2 | postgresql-client-8.3 | postgresql-client (>= 8.1), - libgstreamer0.10-dev (>= 0.10.17), - libserial-dev (>= 0.5.2) -Standards-Version: 3.6.1 - -Package: campcaster-libs -Architecture: any -Depends: ${shlibs:Depends}, - libc6 (>= 2.3.4-1), - libgcc1 (>= 1:4.0.2), - libstdc++6 (>= 4.0.2-4), - libglib2.0-0 (>= 2.9.3), - libpopt0 (>= 1.7), - libxml2 (>= 2.6.23), - zlib1g (>= 1:1.2.1), - libasound2 (>> 1.0.10), - libid3tag0 (>= 0.15.1b) -Description: A radio program automation and support tool. - Campcaster is the first free and open radio management software that - provides live studio broadcast capabilities as well as remote automation - in one integrated system. - . - Major features of Campcaster: live, in-studio playout; web-based remote - station management; automation; playlists; centralized archives of station - program material; solid, fast playback using the Gstreamer multimedia - framework; search-based backup; localization into several languages; - innovative design by the Parsons School of Design; open, extensible - architecture based on XML-RPC. - . - This package contains the libraries used by Campcaster. - . - Web site: http://campcaster.campware.org - -Package: campcaster-station -Architecture: any -Depends: ${shlibs:Depends}, - campcaster-libs (= ${binary:Version}), - sed, - pwgen, - unixodbc (>= 2.2), - odbc-postgresql, - libfontconfig1, - libpng12-0, - libjpeg62, - libssl0.9.8, - libxml2, - libpopt0, - libasound2, - libid3tag0, - libbz2-1.0, - libtar (>= 1.2.11), - curl, - libcurl3, - libboost-date-time1.33.1 | libboost-date-time1.34.1, - libxml++2.6c2a (>= 2.8.1), - libicu34 | libicu36 | libicu38, - apache2, - php5-pgsql, - libapache2-mod-php5, - php-pear, - php5-gd, - postgresql-8.1 | postgresql-8.2 | postgresql-8.3 | postgresql (>= 8.1), - postgresql-client-8.1 | postgresql-client-8.2 | postgresql-client-8.3 | postgresql-client (>= 8.1), - libgstreamer0.10-0 (>= 0.10.17), - gstreamer0.10-plugins-good (>= 0.10.7), - gstreamer0.10-plugins-ugly (>= 0.10.7) -Description: A radio program automation and support tool. - Campcaster is the first free and open radio management software that - provides live studio broadcast capabilities as well as remote automation - in one integrated system. - . - Major features of Campcaster: live, in-studio playout; web-based remote - station management; automation; playlists; centralized archives of station - program material; solid, fast playback using the Gstreamer multimedia - framework; search-based backup; localization into several languages; - innovative design by the Parsons School of Design; open, extensible - architecture based on XML-RPC. - . - This package contains the server components of Campcaster: - a storage server, a scheduler daemon, and a web interface. - . - Web site: http://campcaster.campware.org - -Package: campcaster-studio -Architecture: any -Depends: ${shlibs:Depends}, - campcaster-libs (= ${binary:Version}), - campcaster-station (= ${binary:Version}), - sed, - unixodbc (>= 2.2), - odbc-postgresql, - libfontconfig1, - libpng12-0, - libjpeg62, - libssl0.9.8, - libxml2, - libpopt0, - libasound2, - libid3tag0, - libmad0, - libogg0, - libvorbis0a, - libbz2-1.0, - libtar (>= 1.2.11), - libcurl3 (>= 7.12.3), - libboost-date-time1.33.1 | libboost-date-time1.34.1, - libxml++2.6c2a (>= 2.8.1), - libicu34 | libicu36 | libicu38, - libgtk2.0-0 (>= 2.6.10), - libgtkmm-2.4-1c2a (>= 1:2.6.5), - libglademm-2.4-1c2a (>= 2.6.2), - libserial0 (>= 0.5.2) -Description: A radio program automation and support tool. - Campcaster is the first free and open radio management software that - provides live studio broadcast capabilities as well as remote automation - in one integrated system. - . - Major features of Campcaster: live, in-studio playout; web-based remote - station management; automation; playlists; centralized archives of station - program material; solid, fast playback using the Gstreamer multimedia - framework; search-based backup; localization into several languages; - innovative design by the Parsons School of Design; open, extensible - architecture based on XML-RPC. - . - This package contains the GUI client component of Campcaster. - . - Web site: http://campcaster.campware.org diff --git a/etc/debian/copyright b/etc/debian/copyright deleted file mode 100644 index c2107af..0000000 --- a/etc/debian/copyright +++ /dev/null @@ -1,25 +0,0 @@ -This package was debianized by Akos Maroy on -Wed, 03 Aug 2005 08:17:25 -0400 - -It was downloaded from http://campcaster.campware.org/ - -Copyright: - -Upstream Author(s): Media Development Loan Fund, http://www.mdlf.org/ - -License: - - Campcaster is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Campcaster is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Campcaster; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - diff --git a/etc/debian/dirs b/etc/debian/dirs deleted file mode 100644 index d61ff19..0000000 --- a/etc/debian/dirs +++ /dev/null @@ -1 +0,0 @@ -opt/campcaster diff --git a/etc/debian/rules b/etc/debian/rules deleted file mode 100755 index 93c1dbb..0000000 --- a/etc/debian/rules +++ /dev/null @@ -1,183 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# This has to be exported to make some magic below work. -export DH_OPTIONS - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - - -CFLAGS = -Wall -g - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -config.status: configure - dh_testdir - CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \ - --build=$(DEB_BUILD_GNU_TYPE) \ - --prefix=/opt/campcaster \ - --with-www-docroot=/var/www \ - --with-apache-group=www-data \ - --with-station-audio-out=hw:0,0 \ - --with-studio-audio-out=hw:1,0 \ - --with-studio-audio-cue=hw:2,0 \ - --with-hostname=localhost - -build: build-arch - -build-arch: build-arch-stamp -build-arch-stamp: config.status - - $(MAKE) setup compile - touch build-arch-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-arch-stamp #CONFIGURE-STAMP# - - -$(MAKE) distclean clean - - dh_clean - -install: install-arch - -install-arch: - dh_testdir - dh_testroot - dh_clean -k -s - dh_installdirs -s - - # this will install everything into /opt/campcaster/usr - $(MAKE) install - - # move the installation to debian/campcaster - mkdir -p $(CURDIR)/debian/campcaster/opt - mv /opt/campcaster $(CURDIR)/debian/campcaster/opt - - # now separate the libraries into debian/campcaster-libs - mkdir -p $(CURDIR)/debian/campcaster-libs - mkdir -p $(CURDIR)/debian/campcaster-libs/opt/campcaster - mkdir -p $(CURDIR)/debian/campcaster-libs/opt/campcaster/bin - mkdir -p $(CURDIR)/debian/campcaster-libs/opt/campcaster/tmp - mkdir -p $(CURDIR)/debian/campcaster-libs/opt/campcaster/usr/lib - mv -f $(CURDIR)/debian/campcaster/opt/campcaster/lib \ - $(CURDIR)/debian/campcaster-libs/opt/campcaster - - # now separate the station (server) files into debian/campcaster-station - mkdir -p $(CURDIR)/debian/campcaster-station - mkdir -p $(CURDIR)/debian/campcaster-station/opt/campcaster - mkdir -p $(CURDIR)/debian/campcaster-station/opt/campcaster/bin - mkdir -p $(CURDIR)/debian/campcaster-station/opt/campcaster/etc - mkdir -p $(CURDIR)/debian/campcaster-station/opt/campcaster/tmp - mkdir -p $(CURDIR)/debian/campcaster-station/opt/campcaster/var/Campcaster - mkdir -p $(CURDIR)/debian/campcaster-station/opt/campcaster/usr/lib - mv -f $(CURDIR)/debian/campcaster/opt/campcaster/bin/campcaster-scheduler \ - $(CURDIR)/debian/campcaster/opt/campcaster/bin/campcaster-scheduler.sh \ - $(CURDIR)/debian/campcaster/opt/campcaster/bin/postInstallStation.sh \ - $(CURDIR)/debian/campcaster/opt/campcaster/bin/createDatabase.sh \ - $(CURDIR)/debian/campcaster/opt/campcaster/bin/createOdbcDataSource.sh \ - $(CURDIR)/debian/campcaster-station/opt/campcaster/bin - mv -f $(CURDIR)/debian/campcaster/opt/campcaster/etc/campcaster-scheduler.xml* \ - $(CURDIR)/debian/campcaster/opt/campcaster/etc/odbc* \ - $(CURDIR)/debian/campcaster-station/opt/campcaster/etc - mv -f $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/alib \ - $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/archiveServer \ - $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/getid3 \ - $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/htmlUI \ - $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/index.php \ - $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/scheduler \ - $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/storageServer \ - $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/storageAdmin \ - $(CURDIR)/debian/campcaster-station/opt/campcaster/var/Campcaster - mv -f $(CURDIR)/debian/campcaster/opt/campcaster/bin/campcaster-backup \ - $(CURDIR)/debian/campcaster/opt/campcaster/bin/campcaster-import \ - $(CURDIR)/debian/campcaster/opt/campcaster/bin/dumpDbSchema.sh \ - $(CURDIR)/debian/campcaster/opt/campcaster/bin/campcaster-restore \ - $(CURDIR)/debian/campcaster-station/opt/campcaster/bin - mv -f $(CURDIR)/debian/campcaster/opt/campcaster/etc/apache \ - $(CURDIR)/debian/campcaster/opt/campcaster/etc/pg_hba.conf \ - $(CURDIR)/debian/campcaster/opt/campcaster/etc/campcaster-scheduler \ - $(CURDIR)/debian/campcaster-station/opt/campcaster/etc - - # now separate the studio (client) files into debian/campcaster-studio - mkdir -p $(CURDIR)/debian/campcaster-studio - mkdir -p $(CURDIR)/debian/campcaster-studio/opt/campcaster - mkdir -p $(CURDIR)/debian/campcaster-studio/opt/campcaster/bin - mkdir -p $(CURDIR)/debian/campcaster-studio/opt/campcaster/etc - mkdir -p $(CURDIR)/debian/campcaster-studio/opt/campcaster/tmp - mkdir -p $(CURDIR)/debian/campcaster-studio/opt/campcaster/var/Campcaster - mv -f $(CURDIR)/debian/campcaster/opt/campcaster/bin/campcaster-studio \ - $(CURDIR)/debian/campcaster/opt/campcaster/bin/campcaster-studio.sh \ - $(CURDIR)/debian/campcaster-studio/opt/campcaster/bin - mv -f $(CURDIR)/debian/campcaster/opt/campcaster/etc/campcaster-studio.xml* \ - $(CURDIR)/debian/campcaster-studio/opt/campcaster/etc - mv -f $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/Widgets \ - $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/studio-localization \ - $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/glade \ - $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/campcaster.png \ - $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/icon*.png \ - $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/stationLogo.png \ - $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/testAudio.ogg \ - $(CURDIR)/debian/campcaster/opt/campcaster/var/Campcaster/testAudio.ogg.license \ - $(CURDIR)/debian/campcaster-studio/opt/campcaster/var/Campcaster - mkdir -p $(CURDIR)/debian/campcaster-studio/usr/share/applications - cp -a $(CURDIR)/debian/campcaster-studio.desktop \ - $(CURDIR)/debian/campcaster-studio/usr/share/applications/ - dh_desktop -pcampcaster-studio - dh_installmenu - - dh_install -s - -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs -# dh_installdocs -# dh_installexamples - dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# Replaced dh_installinit with manual init script installation -# because invoke.rc-d is linked to /bin/true in the knoppix hdd install. -# Should be changed back when/if knoppix is fixed. -# dh_installinit --update-rcd-params="defaults 92" -# dh_installcron -# dh_installinfo -# dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps -l${CURDIR}/debian/campcaster-libs/opt/campcaster/lib - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture dependant packages using the common target. -binary-arch: build-arch install-arch - $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common - -binary: binary-arch -.PHONY: build clean binary-arch binary install install-arch diff --git a/src/modules/archiveServer/etc/Makefile.in b/src/modules/archiveServer/etc/Makefile.in index 7556930..379df9d 100644 --- a/src/modules/archiveServer/etc/Makefile.in +++ b/src/modules/archiveServer/etc/Makefile.in @@ -91,11 +91,13 @@ DB_PASSWORD = @DB_PASSWORD@ PHP_URL_PREFIX = @URL_PREFIX@ -USR_LIB_DIR_S=$(shell ${ECHO} ${USR_LIB_DIR} | ${SED} -e "s/\//\\\\\\\\\//g") +SHR_WWW_DIR_S=$(shell ${ECHO} /usr/share/campcaster/www | ${SED} -e "s/\//\\\\\\\\\//g") +USR_LIB_DIR_S=$(shell ${ECHO} /usr/lib/campcaster | ${SED} -e "s/\//\\\\\\\\\//g") PHP_URL_PREFIX_S=$(shell ${ECHO} ${PHP_URL_PREFIX} | ${SED} -e "s/\//\\\\\\\\\//g") REPLACE_SED_STRING="s/ls_lib_dir/${USR_LIB_DIR_S}/; \ s/ls_dbuser/${DB_USER}/; \ + s/ls_shr_www/${SHR_WWW_DIR_S}/; \ s/ls_dbpassword/${DB_PASSWORD}/; \ s/ls_dbserver/${DB_SERVER}/; \ s/ls_database/${DATABASE}/; \ diff --git a/src/modules/archiveServer/var/conf.php.template b/src/modules/archiveServer/var/conf.php.template index ca051ab..079846b 100644 --- a/src/modules/archiveServer/var/conf.php.template +++ b/src/modules/archiveServer/var/conf.php.template @@ -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 @@ $CC_CONFIG = array( '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 @@ $CC_CONFIG['sysSubjs'] = array( ); $old_ip = get_include_path(); set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath'].PATH_SEPARATOR.$old_ip); -?> \ No newline at end of file +?> diff --git a/src/modules/htmlUI/etc/Makefile.in b/src/modules/htmlUI/etc/Makefile.in index f6454b1..59cbe4c 100644 --- a/src/modules/htmlUI/etc/Makefile.in +++ b/src/modules/htmlUI/etc/Makefile.in @@ -79,7 +79,11 @@ APACHE_GROUP = @APACHE_GROUP@ WWW_DOCROOT = @WWW_DOCROOT@ STORAGE_SERVER = @STORAGE_SERVER@ -REPLACE_SED_STRING="s\storage_server\${STORAGE_SERVER}\;" +STORAGE_SERVER_S=$(shell ${ECHO} "${STORAGE_SERVER}" | ${SED} -e "s/\//\\\\\\\\\//g") +HTMLUI_DIR_S=$(shell ${ECHO} "${STORAGE_SERVER}/../htmlUI/var" | ${SED} -e "s/\//\\\\\\\\\//g") + +REPLACE_SED_STRING="s/storage_server/${STORAGE_SERVER_S}/;\ + s/htmlui_dir/${HTMLUI_DIR_S}/;" #------------------------------------------------------------------------------- diff --git a/src/modules/htmlUI/var/ui_conf.php.template b/src/modules/htmlUI/var/ui_conf.php.template index a0ee937..c3d3cd1 100644 --- a/src/modules/htmlUI/var/ui_conf.php.template +++ b/src/modules/htmlUI/var/ui_conf.php.template @@ -151,21 +151,21 @@ $CC_CONFIG = array_merge($CC_CONFIG, ), ) ); -require_once(dirname(__FILE__).'/ui_base.inc.php'); -require_once(dirname(__FILE__).'/ui_scratchpad.class.php'); -require_once(dirname(__FILE__).'/ui_playlist.class.php'); -require_once(dirname(__FILE__).'/ui_search.class.php'); -require_once(dirname(__FILE__).'/ui_browse.class.php'); -require_once(dirname(__FILE__).'/ui_hubBrowse.class.php'); -require_once(dirname(__FILE__).'/ui_hubSearch.class.php'); -require_once(dirname(__FILE__).'/ui_transfers.class.php'); +require_once('htmlui_dir/ui_base.inc.php'); +require_once('htmlui_dir/ui_scratchpad.class.php'); +require_once('htmlui_dir/ui_playlist.class.php'); +require_once('htmlui_dir/ui_search.class.php'); +require_once('htmlui_dir/ui_browse.class.php'); +require_once('htmlui_dir/ui_hubBrowse.class.php'); +require_once('htmlui_dir/ui_hubSearch.class.php'); +require_once('htmlui_dir/ui_transfers.class.php'); require_once('storage_server/var/GreenBox.php'); -require_once(dirname(__FILE__).'/formmask/generic.inc.php'); -require_once(dirname(__FILE__).'/ui_calendar.class.php'); -require_once(dirname(__FILE__).'/ui_scheduler.class.php'); -require_once(dirname(__FILE__).'/ui_subjects.class.php'); -require_once(dirname(__FILE__).'/ui_jscom.php'); -require_once(dirname(__FILE__).'/ui_exchange.class.php'); +require_once('htmlui_dir/formmask/generic.inc.php'); +require_once('htmlui_dir/ui_calendar.class.php'); +require_once('htmlui_dir/ui_scheduler.class.php'); +require_once('htmlui_dir/ui_subjects.class.php'); +require_once('htmlui_dir/ui_jscom.php'); +require_once('htmlui_dir/ui_exchange.class.php'); require_once('DB.php'); require_once('HTML/QuickForm.php'); diff --git a/src/modules/storageAdmin/bin/campcaster-backup b/src/modules/storageAdmin/bin/campcaster-backup index 8ea7761..0273d74 100755 --- a/src/modules/storageAdmin/bin/campcaster-backup +++ b/src/modules/storageAdmin/bin/campcaster-backup @@ -41,8 +41,7 @@ if [ "$phpdir" == "ls_storageAdmin_phppart_dir" ] 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" diff --git a/src/modules/storageAdmin/bin/dumpDbSchema.sh b/src/modules/storageAdmin/bin/dumpDbSchema.sh index 80cd037..830b875 100755 --- a/src/modules/storageAdmin/bin/dumpDbSchema.sh +++ b/src/modules/storageAdmin/bin/dumpDbSchema.sh @@ -35,13 +35,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. diff --git a/src/modules/storageAdmin/etc/Makefile.in b/src/modules/storageAdmin/etc/Makefile.in index 7c114d8..3c4c465 100644 --- a/src/modules/storageAdmin/etc/Makefile.in +++ b/src/modules/storageAdmin/etc/Makefile.in @@ -72,9 +72,10 @@ USR_DIR = ${prefix} DEST_DIR = ${USR_DIR} PHPPART_DIR = ${prefix}/var/Campcaster/storageAdmin/var +REALPHP_DIR = /usr/share/campcaster/www/storageAdmin/var STORAGE_SERVER = @STORAGE_SERVER@ -PHPPART_DIR_S=$(shell ${ECHO} ${PHPPART_DIR} | ${SED} -e "s/\//\\\\\\\\\//g") +PHPPART_DIR_S=$(shell ${ECHO} ${REALPHP_DIR} | ${SED} -e "s/\//\\\\\\\\\//g") STORAGE_SERVER_S=$(shell ${ECHO} ${STORAGE_SERVER} | ${SED} -e "s/\//\\\\\\\\\//g") SED_STORAGE_SERVER="s/ls_storageServer/${STORAGE_SERVER_S}/;" diff --git a/src/modules/storageServer/bin/createDatabase.sh b/src/modules/storageServer/bin/createDatabase.sh index 009cccd..eaf7290 100755 --- a/src/modules/storageServer/bin/createDatabase.sh +++ b/src/modules/storageServer/bin/createDatabase.sh @@ -24,7 +24,7 @@ # Author : $Author$ # Version : $Revision$ # Location : $URL$ -#------------------------------------------------------------------------------- +#------------------------------------------------------------------------------- #------------------------------------------------------------------------------- # This script reates the database used by Campcaster # @@ -35,18 +35,6 @@ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# 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 - - -#------------------------------------------------------------------------------- # Print the usage information for this script. #------------------------------------------------------------------------------- printUsage() @@ -188,7 +176,7 @@ if [ "x$ls_dbserver" == "xlocalhost" ]; then || echo "Couldn't create database user $ls_dbuser."; su - $postgres_user -c "echo \"CREATE DATABASE \\\"$ls_database\\\" \ - OWNER $ls_dbuser ENCODING 'utf-8';\" \ + OWNER $ls_dbuser;\" \ | psql template1" \ || echo "Couldn't create database $ls_database."; else diff --git a/src/modules/storageServer/etc/Makefile.in b/src/modules/storageServer/etc/Makefile.in index 931f5bd..f7fc2e3 100644 --- a/src/modules/storageServer/etc/Makefile.in +++ b/src/modules/storageServer/etc/Makefile.in @@ -100,11 +100,13 @@ PHP_URL_PREFIX = @URL_PREFIX@ SCHEDULER_URL_PREFIX = SCHEDULER_XML_RPC_PREFIX = RC2 -USR_LIB_DIR_S=$(shell ${ECHO} ${USR_LIB_DIR} | ${SED} -e "s/\//\\\\\\\\\//g") +SHR_WWW_DIR_S=$(shell ${ECHO} /usr/share/campcaster/www | ${SED} -e "s/\//\\\\\\\\\//g") +USR_LIB_DIR_S=$(shell ${ECHO} "/usr/lib/campcaster" | ${SED} -e "s/\//\\\\\\\\\//g") PHP_URL_PREFIX_S=$(shell ${ECHO} ${PHP_URL_PREFIX} | ${SED} -e "s/\//\\\\\\\\\//g") REPLACE_SED_STRING="s/ls_lib_dir/${USR_LIB_DIR_S}/; \ s/ls_dbuser/${DB_USER}/; \ + s/ls_shr_www/${SHR_WWW_DIR_S}/; \ s/ls_dbpassword/${DB_PASSWORD}/; \ s/ls_dbserver/${DB_SERVER}/; \ s/ls_database/${DATABASE}/; \ diff --git a/src/modules/storageServer/var/conf.php.template b/src/modules/storageServer/var/conf.php.template index 66ab23f..ac6e0e0 100644 --- a/src/modules/storageServer/var/conf.php.template +++ b/src/modules/storageServer/var/conf.php.template @@ -53,12 +53,12 @@ $CC_CONFIG = array( '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,9 @@ $CC_CONFIG = array( /* =================================================== 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 diff --git a/src/products/gLiveSupport/bin/campcaster-studio.sh b/src/products/gLiveSupport/bin/campcaster-studio.sh index 9cb5d3a..419af7e 100755 --- a/src/products/gLiveSupport/bin/campcaster-studio.sh +++ b/src/products/gLiveSupport/bin/campcaster-studio.sh @@ -34,17 +34,15 @@ #------------------------------------------------------------------------------- # Determine directories, files #------------------------------------------------------------------------------- -reldir=`dirname $0`/.. -basedir=`cd $reldir; pwd;` -bindir=$basedir/bin -etcdir=$basedir/etc -libdir=$basedir/lib -tmpdir=$basedir/tmp +bindir=/usr/lib/campcaster/bin/ +etcdir=/etc +libdir=/usr/lib/campcaster/ #------------------------------------------------------------------------------- # Set up the environment #------------------------------------------------------------------------------- +export PATH=$bindir:$PATH export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH export GST_REGISTRY=$etcdir/gst-registry.xml studio_exe=$bindir/campcaster-studio diff --git a/src/products/gLiveSupport/etc/Makefile.in b/src/products/gLiveSupport/etc/Makefile.in index 69ca874..1a8c6df 100644 --- a/src/products/gLiveSupport/etc/Makefile.in +++ b/src/products/gLiveSupport/etc/Makefile.in @@ -67,6 +67,7 @@ USR_INCLUDE_DIR = ${USR_DIR}/include USR_LIB_DIR = ${USR_DIR}/lib USR_VAR_DIR = ${USR_DIR}/var STORAGE_TMP_DIR = "/tmp" +REAL_SHR_DIR = "/usr/share/campcaster/www" HOSTNAME = @HOSTNAME@ WWW_PORT = @WWW_PORT@ @@ -81,9 +82,9 @@ AUDIO_CUE = "@AUDIO_CUE@" PHP_URL_PREFIX=campcaster ALIB_XML_RPC_PREFIX=xmlrpc/xrLocStor.php SCHEDULER_XML_RPC_PREFIX=RC2 -SCHEDULER_DAEMON_COMMAND="sudo ${USR_BIN_DIR}/campcaster-scheduler.sh" +SCHEDULER_DAEMON_COMMAND="sudo /etc/init.d/campcaster" -USR_VAR_DIR_S=$(shell ${ECHO} ${USR_VAR_DIR} | ${SED} -e "s/\//\\\\\\\\\//g") +USR_VAR_DIR_S=$(shell ${ECHO} ${REAL_SHR_DIR} | ${SED} -e "s/\//\\\\\\\\\//g") PHP_URL_PREFIX_S=$(shell ${ECHO} ${PHP_URL_PREFIX} | \ ${SED} -e "s/\//\\\\\\\\\//g") ALIB_XML_RPC_PREFIX_S=$(shell ${ECHO} ${ALIB_XML_RPC_PREFIX} | \ diff --git a/src/products/gLiveSupport/var/icon32.xpm b/src/products/gLiveSupport/var/icon32.xpm new file mode 100644 index 0000000..90f2a46 --- /dev/null +++ b/src/products/gLiveSupport/var/icon32.xpm @@ -0,0 +1,185 @@ +/* XPM */ +static char *icon__[] = { +/* columns rows colors chars-per-pixel */ +"32 32 147 2", +" c #B6480F", +". c #BB4D16", +"X c #BE4D14", +"o c #BE4E16", +"O c #C2521C", +"+ c #D9521C", +"@ c #C45925", +"# c #C95923", +"$ c #CD5D27", +"% c #CD5E2C", +"& c #D75A25", +"* c #DF5E2A", +"= c #D46632", +"- c #DF6732", +"; c #D86C3D", +": c #DB6D3C", +"> c #DF6E3E", +", c #E6642E", +"< c #E26330", +"1 c #E06735", +"2 c #E26837", +"3 c #E56938", +"4 c #E26D39", +"5 c #E56C3B", +"6 c #E56D3D", +"7 c #E96A38", +"8 c #DC7040", +"9 c #DD7242", +"0 c #DE7245", +"q c #E27343", +"w c #E47242", +"e c #E37546", +"r c #E37547", +"t c #EB7241", +"y c #E97343", +"u c #EA7647", +"i c #E37548", +"p c #E77749", +"a c #EA7749", +"s c #E27E4E", +"d c #E9794C", +"f c #E97A4E", +"g c #E57B50", +"h c #E37D50", +"j c #E27C52", +"k c #EE7D50", +"l c #E87E54", +"z c #E68055", +"x c #EB8050", +"c c #EA8052", +"v c #E98056", +"b c #ED8157", +"n c #EE8157", +"m c #E5845C", +"M c #E7875F", +"N c #E98158", +"B c #E88359", +"V c #E98459", +"C c #EE865B", +"Z c #E8855D", +"A c #E9865E", +"S c #EE875F", +"D c #F1855A", +"F c #EA8860", +"G c #EC8A60", +"H c #EE8A62", +"J c #EB8C64", +"K c #E98C66", +"L c #EE8C66", +"P c #EF8D66", +"I c #EB926C", +"U c #EB926D", +"Y c #EF946F", +"T c #F1916B", +"R c #F1936E", +"E c #EF9470", +"W c #ED9775", +"Q c #EF9976", +"! c #EE9978", +"~ c #EE9D7A", +"^ c #F19571", +"/ c #F59872", +"( c #F39974", +") c #F09A77", +"_ c #F79B78", +"` c #F19D78", +"' c #F39C79", +"] c #F49E7B", +"[ c #F79E7B", +"{ c #F39C7C", +"} c #F29D7C", +"| c #EFA07E", +" . c #F7A17F", +".. c #F5A282", +"X. c #F7A282", +"o. c #F7A382", +"O. c #F7A785", +"+. c #F8A585", +"@. c #F8A687", +"#. c #F4A98A", +"$. c #F7A98B", +"%. c #F7AB8D", +"&. c #F5AC8D", +"*. c #F9AA8A", +"=. c #FAAC8D", +"-. c #F7AF92", +";. c #F9AE91", +":. c #F7B091", +">. c #F8B196", +",. c #FAB59B", +"<. c #FCB699", +"1. c #FAB79C", +"2. c #FABB9F", +"3. c #FBBCA1", +"4. c #FCBEA6", +"5. c #FBC0A6", +"6. c #FDC1AA", +"7. c #FCC2AC", +"8. c #FDC4AE", +"9. c #FEC5AF", +"0. c #FDC5B0", +"q. c #FFC6B0", +"w. c #FFC6B1", +"e. c #FEC7B2", +"r. c #FFCBB4", +"t. c #FECBB6", +"y. c #FECCB6", +"u. c #FFCDB7", +"i. c #FFCBB9", +"p. c #FFCCB8", +"a. c #FECCB9", +"s. c #FFCEBA", +"d. c #FFD1BF", +"f. c #FFD2BF", +"g. c #FFD2C1", +"h. c #FFD3C1", +"j. c #FFD2C2", +"k. c #FFD4C4", +"l. c #FFD5C4", +"z. c #FFD5C5", +"x. c #FFD6C7", +"c. c #FFD7C7", +"v. c #FFD8C7", +"b. c #FFD7C9", +"n. c #FFD9C9", +"m. c #FFD9CA", +"M. c None", +/* pixels */ +"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.M.M.M.M.k / +.+.] D , M.M.M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.M.< ' 8.c.n.b.c.n.v.a.=.u M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.] c.c.7.#.^ F B A Y %.e.d.<.y M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.f t.a.( : o M.M.M.M.M.M.M.. : .6.[ M.M.M.M.M.M.M.", +"M.M.M.M.M.M.( 8.K o M.M.M.M.M.M.M.M.M.M.M.M.M.@ U *.7 M.M.M.M.M.", +"M.M.M.M.M. .Q O M.M.M.M.M.& f S H C a M.M.M.M.M.M.M.T y M.M.M.M.", +"M.M.M.M.R 0 M.M.M.M.M.p ;.i.j.c.j.j.j.e.o.3 M.M.M.M.M.l 6 M.M.M.", +"M.M.M.b M.M.M.M.M.5 >.d.4.{ v e e e f Y 1.e.o.* M.M.M.M.M.+ M.M.", +"M.M.2 M.M.M.M.M.L e.#.> M.M.M.M.M.M.M.M.% ) ,.n M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M...:.: M.M.M.M.M.M.M.M.M.M.M.M.M.M.Q L M.M.M.M.M.M.", +"M.M.M.M.M.M.{ h M.M.M.M.M.M.1 x c 4 M.M.M.M.M.M.M.M.B M.M.M.M.M.", +"M.M.M.M.M.A M.M.M.M.M.M.V 3.a.a.r.y.5.' M.M.M.M.M.M.M.1 M.M.M.M.", +"M.M.M.M.i M.M.M.M.M.M.%.2.I 9 $ # = s ~ :.H M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.w O.h M.M.M.M.M.M.M.M.M.M K M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.z M.M.M.M.M.M.M.M.M.M.M.M.M.m M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.", +"M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M.M." +}; diff --git a/src/products/scheduler/bin/campcaster-scheduler.sh b/src/products/scheduler/bin/campcaster-scheduler.sh index 47ebcc9..2b54b0f 100755 --- a/src/products/scheduler/bin/campcaster-scheduler.sh +++ b/src/products/scheduler/bin/campcaster-scheduler.sh @@ -1,5 +1,6 @@ #!/bin/bash -#-------------------------------------------------------------------------------# Copyright (c) 2004 Media Development Loan Fund +#------------------------------------------------------------------------------- +# Copyright (c) 2004 Media Development Loan Fund # # This file is part of the Campcaster project. # http://campcaster.campware.org/ @@ -33,17 +34,15 @@ #------------------------------------------------------------------------------- # Determine directories, files #------------------------------------------------------------------------------- -reldir=`dirname $0`/.. -basedir=`cd $reldir; pwd;` -bindir=$basedir/bin -etcdir=$basedir/etc -libdir=$basedir/lib -vardir=$basedir/var/Campcaster/scheduler/var - +bindir=/usr/lib/campcaster/bin +etcdir=/etc +libdir=/usr/lib/campcaster/ +vardir=/usr/share/campcaster/www/scheduler/var #------------------------------------------------------------------------------- # Set up the environment #------------------------------------------------------------------------------- +export PATH=$bindir:$PATH export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH export GST_REGISTRY=$etcdir/gst-registry.xml scheduler_exe=$bindir/campcaster-scheduler diff --git a/src/products/scheduler/bin/createDatabase.sh b/src/products/scheduler/bin/createDatabase.sh index 317d8fc..5f7cc2f 100755 --- a/src/products/scheduler/bin/createDatabase.sh +++ b/src/products/scheduler/bin/createDatabase.sh @@ -35,18 +35,6 @@ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- -# 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 - - -#------------------------------------------------------------------------------- # Print the usage information for this script. #------------------------------------------------------------------------------- printUsage() @@ -183,7 +171,7 @@ if [ "x$dbserver" == "xlocalhost" ]; then || echo "Couldn't create database user $dbuser."; su - $postgres_user -c "echo \"CREATE DATABASE \\\"$database\\\" \ - OWNER $dbuser ENCODING 'utf-8';\" \ + OWNER $dbuser;\" \ | psql template1" \ || echo "Couldn't create database $database."; else diff --git a/src/products/scheduler/bin/createOdbcDataSource.sh b/src/products/scheduler/bin/createOdbcDataSource.sh index 0f576a4..60dd2eb 100755 --- a/src/products/scheduler/bin/createOdbcDataSource.sh +++ b/src/products/scheduler/bin/createOdbcDataSource.sh @@ -37,13 +37,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/ #------------------------------------------------------------------------------- diff --git a/src/products/scheduler/etc/Makefile.in b/src/products/scheduler/etc/Makefile.in index 00c19a7..5fd5e21 100644 --- a/src/products/scheduler/etc/Makefile.in +++ b/src/products/scheduler/etc/Makefile.in @@ -82,6 +82,8 @@ ALIB_XML_RPC_PREFIX=xmlrpc/xrLocStor.php POSTGRES_USER=postgres USR_LIB_DIR_S=$(shell ${ECHO} ${USR_LIB_DIR} | ${SED} -e "s/\//\\\\\\\\\//g") +STORAGE_PID_DIR_S=$(shell ${ECHO} /var/run/ | \ + ${SED} -e "s/\//\\\\\\\\\//g") STORAGE_TMP_DIR_S=$(shell ${ECHO} ${STORAGE_TMP_DIR} | \ ${SED} -e "s/\//\\\\\\\\\//g") PHP_URL_PREFIX_S=$(shell ${ECHO} ${PHP_URL_PREFIX} | \ @@ -101,6 +103,7 @@ REPLACE_SED_STRING="s/ls_lib_dir/${USR_LIB_DIR_S}/; \ s/ls_php_port/${WWW_PORT}/; \ s/ls_alib_xmlRpcPrefix/${ALIB_XML_RPC_PREFIX_S}/; \ s/ls_tmp_dir/${STORAGE_TMP_DIR_S}/; \ + s/ls_pid_dir/${STORAGE_PID_DIR_S}/; \ s/ls_audio_output_device/${AUDIO_OUT_S}/; \ s/ls_scheduler_host/${HOSTNAME}/; \ s/ls_scheduler_port/${SCHEDULER_PORT}/;" diff --git a/src/products/scheduler/etc/campcaster-scheduler.xml.template b/src/products/scheduler/etc/campcaster-scheduler.xml.template index 0ea00e1..d0f8f4d 100644 --- a/src/products/scheduler/etc/campcaster-scheduler.xml.template +++ b/src/products/scheduler/etc/campcaster-scheduler.xml.template @@ -124,7 +124,7 @@