diff --git a/livesupport/bin/postInstallGLiveSupport.sh b/livesupport/bin/postInstallGLiveSupport.sh
index f24e43fd9..b5711d76f 100755
--- a/livesupport/bin/postInstallGLiveSupport.sh
+++ b/livesupport/bin/postInstallGLiveSupport.sh
@@ -21,8 +21,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
#
-# Author : $Author: maroy $
-# Version : $Revision: 1.3 $
+# Author : $Author: mash $
+# Version : $Revision: 1.4 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/postInstallGLiveSupport.sh,v $
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
@@ -59,6 +59,10 @@ printUsage()
echo " -p, --port The port of the apache web server [default: 80]"
echo " -P, --scheduler-port The port of the scheduler daemon to install"
echo " [default: 3344]";
+ echo " -o, --output-dsp The dsp device of live-mode broadcast";
+ echo " [default: /dev/dsp]";
+ echo " -c, --cue-dsp The dsp device of preview listening";
+ echo " [default: /dev/dsp]";
echo " -h, --help Print this message and exit.";
echo "";
}
@@ -69,7 +73,7 @@ printUsage()
#-------------------------------------------------------------------------------
CMD=${0##*/}
-opts=$(getopt -o d:H:hp:P: -l directory:,host:,help,port:,scheduler-port: -n $CMD -- "$@") || exit 1
+opts=$(getopt -o d:H:hp:P:c:o: -l directory:,host:,help,port:,scheduler-port:cue-dsp:output-dsp: -n $CMD -- "$@") || exit 1
eval set -- "$opts"
while true; do
case "$1" in
@@ -88,6 +92,12 @@ while true; do
-P|--scheduler-port)
scheduler_port=$2;
shift; shift;;
+ -o|--output-dsp)
+ output_dsp=$2;
+ shift; shift;;
+ -c|--cue_dsp)
+ cue_dsp=$2;
+ shift; shift;;
--)
shift;
break;;
@@ -116,6 +126,13 @@ if [ "x$scheduler_port" == "x" ]; then
scheduler_port=3344;
fi
+if [ "x$output_dsp" == "x" ]; then
+ output_dsp=/dev/dsp;
+fi
+
+if [ "x$cue_dsp" == "x" ]; then
+ cue_dsp=/dev/dsp;
+fi
echo "Making post-install steps for GLiveSupport.";
echo "";
@@ -125,6 +142,8 @@ echo " installation directory: $installdir";
echo " host name: $hostname";
echo " web server port: $http_port";
echo " scheduler port: $scheduler_port";
+echo " live broadcast device: $output_dsp";
+echo " preview device: $cue_dsp";
echo ""
#-------------------------------------------------------------------------------
@@ -141,6 +160,8 @@ ls_scheduler_host=$hostname
ls_scheduler_port=$scheduler_port
ls_scheduler_urlPrefix=
ls_scheduler_xmlRpcPrefix=RC2
+ls_output_dsp=$output_dsp
+ls_cue_dsp=$cue_dsp
install_bin=$installdir/bin
@@ -162,6 +183,8 @@ ls_scheduler_urlPrefix_s=`echo $ls_scheduler_urlPrefix | \
sed -e "s/\//\\\\\\\\\//g"`
ls_scheduler_xmlRpcPrefix_s=`echo $ls_scheduler_xmlRpcPrefix | \
sed -e "s/\//\\\\\\\\\//g"`
+ls_output_dsp_s=`echo $ls_output_dsp | sed -e "s/\//\\\\\\\\\//g"`
+ls_cue_dsp_s=`echo $ls_cue_dsp | sed -e "s/\//\\\\\\\\\//g"`
replace_sed_string="s/ls_install_dir/$installdir_s/; \
s/ls_storageUrlPath/\/$ls_php_urlPrefix_s\/storageServer\/var/; \
@@ -170,6 +193,8 @@ replace_sed_string="s/ls_install_dir/$installdir_s/; \
s/ls_alib_xmlRpcPrefix/$ls_alib_xmlRpcPrefix_s/; \
s/ls_php_host/$ls_php_host/; \
s/ls_php_port/$ls_php_port/; \
+ s/ls_output_dsp/$ls_output_dsp_s/; \
+ s/ls_cue_dsp/$ls_cue_dsp_s/; \
s/ls_archiveUrlPath/\/$ls_php_urlPrefix_s\/archiveServer\/var/; \
s/ls_scheduler_urlPrefix/$ls_scheduler_urlPrefix_s/; \
s/ls_scheduler_xmlRpcPrefix/$ls_scheduler_xmlRpcPrefix_s/; \
diff --git a/livesupport/bin/postInstallScheduler.sh b/livesupport/bin/postInstallScheduler.sh
index 41250106d..43cfe59d8 100755
--- a/livesupport/bin/postInstallScheduler.sh
+++ b/livesupport/bin/postInstallScheduler.sh
@@ -21,8 +21,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
#
-# Author : $Author: maroy $
-# Version : $Revision: 1.1 $
+# Author : $Author: mash $
+# Version : $Revision: 1.2 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/postInstallScheduler.sh,v $
#-------------------------------------------------------------------------------
#-------------------------------------------------------------------------------
@@ -71,6 +71,8 @@ printUsage()
echo " database. [default: livesupport]";
echo " -w, --dbpassword The database user password.";
echo " [default: livesupport]";
+ echo " -o, --output-dsp The dsp device of broadcast";
+ echo " [default: /dev/dsp]";
echo " -h, --help Print this message and exit.";
echo "";
}
@@ -81,7 +83,7 @@ printUsage()
#-------------------------------------------------------------------------------
CMD=${0##*/}
-opts=$(getopt -o d:D:g:H:hp:P:r:s:u:w: -l apache-group:,database:,dbserver:,dbuser:,dbpassword:,directory:,host:,help,port:,scheduler-port:,www-root: -n $CMD -- "$@") || exit 1
+opts=$(getopt -o d:D:g:H:hp:P:r:s:u:w:o: -l apache-group:,database:,dbserver:,dbuser:,dbpassword:,directory:,host:,help,port:,scheduler-port:,www-root:,output-dsp -n $CMD -- "$@") || exit 1
eval set -- "$opts"
while true; do
case "$1" in
@@ -118,6 +120,9 @@ while true; do
-w|--dbpassword)
dbpassword=$2;
shift; shift;;
+ -o|--output-dsp)
+ output_dsp=$2;
+ shift; shift;;
--)
shift;
break;;
@@ -170,6 +175,9 @@ if [ "x$www_root" == "x" ]; then
www_root=/var/www
fi
+if [ "x$output_dsp" == "x" ]; then
+ output_dsp=/dev/dsp;
+fi
echo "Making post-install steps for the LiveSupport scheduler.";
echo "";
@@ -185,6 +193,7 @@ echo " database user: $dbuser";
echo " database user password: $dbpassword";
echo " apache daemon group: $apache_group";
echo " apache document root: $www_root";
+echo " broadcast device: $output_dsp";
echo ""
#-------------------------------------------------------------------------------
@@ -206,6 +215,7 @@ ls_scheduler_host=$hostname
ls_scheduler_port=$scheduler_port
ls_scheduler_urlPrefix=
ls_scheduler_xmlRpcPrefix=RC2
+ls_output_dsp=$output_dsp
postgres_user=postgres
@@ -229,6 +239,7 @@ ls_scheduler_urlPrefix_s=`echo $ls_scheduler_urlPrefix | \
sed -e "s/\//\\\\\\\\\//g"`
ls_scheduler_xmlRpcPrefix_s=`echo $ls_scheduler_xmlRpcPrefix | \
sed -e "s/\//\\\\\\\\\//g"`
+ls_output_dsp_s=`echo $ls_output_dsp | sed -e "s/\//\\\\\\\\\//g"`
replace_sed_string="s/ls_install_dir/$installdir_s/; \
s/ls_dbuser/$ls_dbuser/; \
@@ -241,6 +252,7 @@ replace_sed_string="s/ls_install_dir/$installdir_s/; \
s/ls_alib_xmlRpcPrefix/$ls_alib_xmlRpcPrefix_s/; \
s/ls_php_host/$ls_php_host/; \
s/ls_php_port/$ls_php_port/; \
+ s/ls_output_dsp/$ls_output_dsp_s/; \
s/ls_archiveUrlPath/\/$ls_php_urlPrefix_s\/archiveServer\/var/; \
s/ls_scheduler_urlPrefix/$ls_scheduler_urlPrefix_s/; \
s/ls_scheduler_xmlRpcPrefix/$ls_scheduler_xmlRpcPrefix_s/; \
diff --git a/livesupport/products/gLiveSupport/etc/gLiveSupport.xml.template b/livesupport/products/gLiveSupport/etc/gLiveSupport.xml.template
index 802518889..951a9499b 100644
--- a/livesupport/products/gLiveSupport/etc/gLiveSupport.xml.template
+++ b/livesupport/products/gLiveSupport/etc/gLiveSupport.xml.template
@@ -121,7 +121,7 @@
@@ -129,7 +129,7 @@
diff --git a/livesupport/products/scheduler/etc/scheduler.xml.template b/livesupport/products/scheduler/etc/scheduler.xml.template
index 265c37c24..c83258ce2 100644
--- a/livesupport/products/scheduler/etc/scheduler.xml.template
+++ b/livesupport/products/scheduler/etc/scheduler.xml.template
@@ -120,7 +120,9 @@
-
+