Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

miscellaneous installation-related fixes; part of #1775

Browse source
This commit is contained in:
fgerlits 2006-09-04 16:59:27 +00:00
parent 7f36372351
commit 33008a73df
17 changed files with 85 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

13
livesupport/INSTALL
View file

@ -32,18 +32,19 @@ For detailed installation instructions, see the doc/install.html document.
For the impatient, do the following (make sure to run at least the For the impatient, do the following (make sure to run at least the
bin/install.sh script as root): bin/install.sh script as root):
wget http://livesupport.campware.org/look/campware/download/livesupport-<version>.tar.bz2 wget http://switch.dl.sourceforge.net/sourceforge/livesupport/livesupport-<version>.tar.bz2
wget http://livesupport.campware.org/look/campware/download/livesupport-libraries-<version>.tar.bz2 wget http://switch.dl.sourceforge.net/sourceforge/livesupport/livesupport-libraries-<version>.tar.bz2
tar xfj livesupport-<version>.tar.bz2 tar xfj livesupport-<version>.tar.bz2
tar xfj livesupport-libraries-<version>.tar.bz2 tar xfj livesupport-libraries-<version>.tar.bz2
cd livesupport-<version> cd livesupport-<version>
./configure ./configure --prefix=/usr/local/livesupport --with-apache-group=apache --with-www-docroot=/var/www
make setup && make compile make
./bin/install.sh -d /usr/local/livesupport -g apache -r /var/www make install
./bin/postInstallStation.sh -d /usr/local/livesupport -g apache -r /var/www
/usr/local/livesupport/bin/scheduler.sh start /usr/local/livesupport/bin/scheduler.sh start
Then try the URL http://localhost/livesupport/htmlUI/var/html/ , Then try the URL http://localhost/livesupport/htmlUI/var/html/
and log in using username: root, password: q. and log in using username: root, password: q.

36
livesupport/bin/postInstallStation.sh
View file

@ -65,7 +65,9 @@ printUsage()
echo " -w, --dbpassword The database user password."; echo " -w, --dbpassword The database user password.";
echo " [default: livesupport]"; echo " [default: livesupport]";
echo " -p, --postgresql-dir The postgresql data directory, containing" echo " -p, --postgresql-dir The postgresql data directory, containing"
echo " pg_hba.conf [default: /etc/postgresql]" echo " pg_hba.conf [default: /etc/postgresql]"
echo " -i, --postgresql-init-script The name of the postgresql init
echo " script in /etc/init.d [default: postgresql]"
echo " -h, --help Print this message and exit."; echo " -h, --help Print this message and exit.";
echo ""; echo "";
} }
@ -76,7 +78,7 @@ printUsage()
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
CMD=${0##*/} CMD=${0##*/}
opts=$(getopt -o d:D:g:hp:r:s:u:w: -l apache-group:,database:,dbserver:,dbuser:,dbpassword:,directory:,help,postgresql-dir:,www-root: -n $CMD -- "$@") || exit 1 opts=$(getopt -o d:D:g:hi:p:r:s:u:w: -l apache-group:,database:,dbserver:,dbuser:,dbpassword:,directory:,help,postgresql-dir:,postgresql-init-script:,www-root: -n $CMD -- "$@") || exit 1
eval set -- "$opts" eval set -- "$opts"
while true; do while true; do
case "$1" in case "$1" in
@ -92,6 +94,9 @@ while true; do
-h|--help) -h|--help)
printUsage; printUsage;
exit 0;; exit 0;;
-i|--postgresql-init-script)
postgresql_init_script=$2;
shift; shift;;
-p|--postgresql-dir) -p|--postgresql-dir)
postgresql_dir=$2; postgresql_dir=$2;
shift; shift;; shift; shift;;
@ -147,6 +152,10 @@ if [ "x$postgresql_dir" == "x" ]; then
postgresql_dir=/etc/postgresql; postgresql_dir=/etc/postgresql;
fi fi
if [ "x$postgresql_init_script" == "x" ]; then
postgresql_init_script=postgresql;
fi
if [ "x$www_root" == "x" ]; then if [ "x$www_root" == "x" ]; then
www_root=/var/www; www_root=/var/www;
fi fi
@ -252,8 +261,8 @@ chown root:$postgres_user $pg_config_dir/$pg_config_file
# don't use restart for the init script, as it might return prematurely # 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 # and in the later call to psql we wouldn't be able to connect
/etc/init.d/postgresql stop /etc/init.d/${postgresql_init_script} stop
/etc/init.d/postgresql start /etc/init.d/${postgresql_init_script} start
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
@ -299,13 +308,22 @@ fi
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
echo "Creating ODBC data source and driver..."; echo "Creating ODBC data source and driver...";
odbcinst_template=$install_etc/odbcinst_template if [ -f /usr/lib/libodbcpsql.so ]; then
odbcinst_template=$install_etc/odbcinst_template
elif [ -f /usr/lib/odbc/psqlodbc.so ]; then
odbcinst_template=$install_etc/odbcinst_debian_template
else
echo "###############################"
echo "Postgresql driver for unixODBC not found;"
echo "please register the PostgreSQL ODBC driver manually."
echo "###############################"
fi
odbc_template=$install_etc/odbc_template odbc_template=$install_etc/odbc_template
odbc_template_tmp=/tmp/odbc_template.$$ odbc_template_tmp=/tmp/odbc_template.$$
# check for an existing PostgreSQL ODBC driver, and only install if necessary # check for an existing PostgreSQL ODBC driver, and only install if necessary
odbcinst_res=`odbcinst -q -d | grep "\[PostgreSQL\]"` odbcinst_res=`odbcinst -q -d | grep "\[PostgreSQL\]"`
if [ "x$odbcinst_res" == "x" ]; then if [ "x$odbcinst_template" != "x" && "x$odbcinst_res" == "x" ]; then
echo "Registering ODBC PostgreSQL driver..."; echo "Registering ODBC PostgreSQL driver...";
odbcinst -i -d -v -f $odbcinst_template || exit 1; odbcinst -i -d -v -f $odbcinst_template || exit 1;
fi fi
@ -361,13 +379,15 @@ echo "Configuring apache ..."
CONFFILE=90_php_livesupport.conf CONFFILE=90_php_livesupport.conf
AP_DDIR_FOUND=no AP_DDIR_FOUND=no
for APACHE_DDIR in \ for APACHE_DDIR in \
/etc/apache/conf.d /etc/apache2/conf/modules.d /etc/httpd/conf.d /etc/apache/conf.d /etc/apache2/conf.d /etc/apache2/conf/modules.d \
/etc/httpd/conf.d
do do
echo -n "$APACHE_DDIR " echo -n "$APACHE_DDIR "
if [ -d $APACHE_DDIR ]; then if [ -d $APACHE_DDIR ]; then
echo "Y" echo "Y"
AP_DDIR_FOUND=yes AP_DDIR_FOUND=yes
cp $basedir/etc/apache/$CONFFILE $APACHE_DDIR cp $basedir/etc/apache/$CONFFILE $APACHE_DDIR
break
else else
echo "N" echo "N"
fi fi
@ -424,7 +444,7 @@ cd -
# create scheduler-related database tables # create scheduler-related database tables
cd $installdir cd $installdir
$bindir/scheduler.sh install || exit 1; ./bin/scheduler.sh install || exit 1;
cd - cd -

6
livesupport/bin/setupDevelopmentEnvironmentAndLog.sh
View file

@ -130,9 +130,9 @@ ls -l $tmpdir/make_modprod_distclean_setup.log >> $tmpdir/make_modprod_distclean
# --with-database-user=LiveSupport =test # --with-database-user=LiveSupport =test
# --with-database-password=LiveSupport =test # --with-database-password=LiveSupport =test
# #
# --with-station-audio-out=default =plughw:0 # --with-station-audio-out=default =default
# --with-studio-audio-out=default =plughw:0 # --with-studio-audio-out=default =default
# --with-studio-audio-cue=default =plughw:0 # --with-studio-audio-cue=default =default
rm -rf $tmpdir/configure rm -rf $tmpdir/configure
echo "Now Configure ... "; echo "Now Configure ... ";

8
livesupport/bin/updateStudioConfig.sh
View file

@ -60,9 +60,9 @@ printUsage()
echo " -P, --scheduler-port The port of the scheduler daemon to install" echo " -P, --scheduler-port The port of the scheduler daemon to install"
echo " [default: 3344]"; echo " [default: 3344]";
echo " -o, --output-device The audio device of live-mode broadcast"; echo " -o, --output-device The audio device of live-mode broadcast";
echo " [default: plughw:0,0]"; echo " [default: default]";
echo " -c, --cue-device The audio device of preview listening"; echo " -c, --cue-device The audio device of preview listening";
echo " [default: plughw:0,0]"; echo " [default: default]";
echo " -h, --help Print this message and exit."; echo " -h, --help Print this message and exit.";
echo ""; echo "";
} }
@ -127,11 +127,11 @@ if [ "x$scheduler_port" == "x" ]; then
fi fi
if [ "x$output_alsa_device" == "x" ]; then if [ "x$output_alsa_device" == "x" ]; then
output_alsa_device="plughw:0,0"; output_alsa_device="default";
fi fi
if [ "x$cue_alsa_device" == "x" ]; then if [ "x$cue_alsa_device" == "x" ]; then
cue_alsa_device="plughw:0,0"; cue_alsa_device="default";
fi fi
echo "Making post-install steps for GLiveSupport."; echo "Making post-install steps for GLiveSupport.";

4
livesupport/bin/user_setup.sh
View file

@ -111,8 +111,8 @@ dbpassword=test
homedir=$HOME homedir=$HOME
configdir=$homedir/.livesupport configdir=$homedir/.livesupport
htmldir=$homedir/public_html htmldir=$homedir/public_html
output_device=plughw:0,0 output_device=default
cue_device=plughw:0,0 cue_device=default
echo "Configuring LiveSupport development environment for user $user."; echo "Configuring LiveSupport development environment for user $user.";

22
livesupport/doc/install.html
View file

@ -33,11 +33,25 @@ steps:<br>
</ul> </ul>
<h2>For the impatient</h2> <h2>For the impatient</h2>
Those who think they know everything, the quick steps to install Those who think they know everything, the quick steps to install
LiveSupport are the following. (To run <code>make</code>, you need write permissions in the <code>prefix</code> directory; to run <code>make install</code>, you need to be root.) LiveSupport are the following. (To run <code>make</code>, you need write
<br> permissions in the <code>prefix</code> directory; to run
<pre><code>wget http://switch.dl.sourceforge.net/sourceforge/livesupport/livesupport-&lt;version&gt;.tar.bz2</code><code><br></code><code>wget </code><code>http://switch.dl.sourceforge.net/sourceforge/livesupport/livesupport-libraries-&lt;version&gt;.tar.bz2</code><code><br>tar xfj livesupport-&lt;version&gt;.tar.bz2<br></code><code>tar xfj livesupport-libraries-&lt;version&gt;.tar.bz2<br>cd livesupport-&lt;version&gt;<br>./configure </code><code>--prefix=/usr/local/livesupport --with-apache-group=apache --with-www-docroot=/var/www</code><code><br>make<br>make install<br>/usr/local/livesupport/bin/scheduler.sh start<br></code></pre> <code>make install</code> and <code>postInstallStation.sh</code>,
you need to be root.)
Then try the URL <code>http://localhost/livesupport/ </code>, <pre><code>
wget http://switch.dl.sourceforge.net/sourceforge/livesupport/livesupport-&lt;version&gt;.tar.bz2
wget http://switch.dl.sourceforge.net/sourceforge/livesupport/livesupport-libraries-&lt;version&gt;.tar.bz2
tar xfj livesupport-&lt;version&gt;.tar.bz2
tar xfj livesupport-libraries-&lt;version&gt;.tar.bz2
cd livesupport-&lt;version&gt;
./configure --prefix=/usr/local/livesupport --with-apache-group=apache --with-www-docroot=/var/www
make
make install
./bin/postInstallStation.sh -d /usr/local/livesupport -g apache -r /var/www
/usr/local/livesupport/bin/scheduler.sh start
<br></code></pre>
Then try the URL <code>http://localhost/livesupport/</code>
and log in using username: <code>root</code>, password: <code>q</code>.<br> and log in using username: <code>root</code>, password: <code>q</code>.<br>
<br> <br>
Everyone else, please read the lines below carefully.<br> Everyone else, please read the lines below carefully.<br>

2
livesupport/etc/apache/90_php_livesupport.conf
View file

@ -1,2 +1,2 @@
php_value upload_max_filesize 32M php_value upload_max_filesize 32M
php_value post_max_size 36M

12
livesupport/etc/configure.ac
View file

@ -228,8 +228,8 @@ AC_SUBST(STATION_AUDIO_OUT)
AC_ARG_WITH([station-audio-out], AC_ARG_WITH([station-audio-out],
AC_HELP_STRING([--with-station-audio-out], AC_HELP_STRING([--with-station-audio-out],
[use the specified audio output device for the station, [use the specified audio output device for the station,
either ALSA or OSS (plughw:0)]), either ALSA or OSS (default)]),
[STATION_AUDIO_OUT=${withval}], [STATION_AUDIO_OUT=plughw:0]) [STATION_AUDIO_OUT=${withval}], [STATION_AUDIO_OUT=default])
AC_MSG_RESULT([using audio output device for the station: ${STAITON_AUDIO_OUT}]) AC_MSG_RESULT([using audio output device for the station: ${STAITON_AUDIO_OUT}])
@ -242,8 +242,8 @@ AC_SUBST(STUDIO_AUDIO_OUT)
AC_ARG_WITH([studio-audio-out], AC_ARG_WITH([studio-audio-out],
AC_HELP_STRING([--with-studio-audio-out], AC_HELP_STRING([--with-studio-audio-out],
[use the specified audio output device for the studio, [use the specified audio output device for the studio,
either ALSA or OSS (plughw:0)]), either ALSA or OSS (default)]),
[STUDIO_AUDIO_OUT=${withval}], [STUDIO_AUDIO_OUT=plughw:0]) [STUDIO_AUDIO_OUT=${withval}], [STUDIO_AUDIO_OUT=default])
AC_MSG_RESULT([using audio output device for studio: ${STUDIO_AUDIO_OUT}]) AC_MSG_RESULT([using audio output device for studio: ${STUDIO_AUDIO_OUT}])
@ -256,8 +256,8 @@ AC_SUBST(STUDIO_AUDIO_CUE)
AC_ARG_WITH([studio-audio-cue], AC_ARG_WITH([studio-audio-cue],
AC_HELP_STRING([--with-studio-audio-cue], AC_HELP_STRING([--with-studio-audio-cue],
[use the specified audio cue device for the studio, [use the specified audio cue device for the studio,
either ALSA or OSS (plughw:0)]), either ALSA or OSS (default)]),
[STUDIO_AUDIO_CUE=${withval}], [STUDIO_AUDIO_CUE=plughw:0]) [STUDIO_AUDIO_CUE=${withval}], [STUDIO_AUDIO_CUE=default])
AC_MSG_RESULT([using audio cue device for studio: ${STUDIO_AUDIO_CUE}]) AC_MSG_RESULT([using audio cue device for studio: ${STUDIO_AUDIO_CUE}])

2
livesupport/etc/portage/media-radio/livesupport/files/postinstall-config-file.patch
View file

@ -24,7 +24,7 @@
+php_url_prefix=livesupport +php_url_prefix=livesupport
+alib_xml_rpc_prefix=xmlrpc/xrLocStor.php +alib_xml_rpc_prefix=xmlrpc/xrLocStor.php
+audio_out=plughw:0 +audio_out=default
+scheduler_port=3344 +scheduler_port=3344
+ +

2
livesupport/src/modules/playlistExecutor/include/LiveSupport/PlaylistExecutor/AudioPlayerFactory.h
View file

@ -73,7 +73,7 @@ using namespace LiveSupport::Core;
* *
* <pre><code> * <pre><code>
* &lt;audioPlayer&gt; * &lt;audioPlayer&gt;
<gstreamerPlayer audioDevice = "plughw:0,0" /> <gstreamerPlayer audioDevice = "default" />
* &lt;/audioPlayer&gt; * &lt;/audioPlayer&gt;
* </code></pre> * </code></pre>
* *

2
livesupport/src/modules/playlistExecutor/src/GstreamerPlayer.h
View file

@ -72,7 +72,7 @@ using namespace LiveSupport::Core;
* This class can be configured with the following XML element. * This class can be configured with the following XML element.
* *
* <pre><code> * <pre><code>
* <gstreamerPlayer audioDevice = "plughw:0,0" /> * <gstreamerPlayer audioDevice = "default" />
* </code></pre> * </code></pre>
* *
* where the optional audioDevice argument specifies the audio device * where the optional audioDevice argument specifies the audio device

6
livesupport/src/modules/storageClient/etc/Makefile.in
View file

@ -173,9 +173,9 @@ check: all ${TEST_RUNNER} storage_server_init
${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT} ${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT}
install: all install: all
${MKDIR} ${USR_INCLUDE_DIR}/LiveSupport/Storage ${MKDIR} ${USR_INCLUDE_DIR}/LiveSupport/StorageClient
${CP} ${INCLUDE_DIR}/LiveSupport/Storage/*.h \ ${CP} ${INCLUDE_DIR}/LiveSupport/StorageClient/*.h \
${USR_INCLUDE_DIR}/LiveSupport/Storage ${USR_INCLUDE_DIR}/LiveSupport/StorageClient
${CP} ${STORAGE_CLIENT_LIB_FILE} ${USR_LIB_DIR} ${CP} ${STORAGE_CLIENT_LIB_FILE} ${USR_LIB_DIR}

8
livesupport/src/products/gLiveSupport/etc/configure.ac
View file

@ -213,8 +213,8 @@ AC_SUBST(AUDIO_OUT)
AC_ARG_WITH([audio-out], AC_ARG_WITH([audio-out],
AC_HELP_STRING([--with-audio-out], AC_HELP_STRING([--with-audio-out],
[use the specified audio output device, either ALSA or OSS [use the specified audio output device, either ALSA or OSS
(plughw:0)]), (default)]),
[AUDIO_OUT=${withval}], [AUDIO_OUT=plughw:0]) [AUDIO_OUT=${withval}], [AUDIO_OUT=default])
AC_MSG_RESULT([using audio output device: ${AUDIO_OUT}]) AC_MSG_RESULT([using audio output device: ${AUDIO_OUT}])
@ -227,8 +227,8 @@ AC_SUBST(AUDIO_CUE)
AC_ARG_WITH([audio-cue], AC_ARG_WITH([audio-cue],
AC_HELP_STRING([--with-audio-cue], AC_HELP_STRING([--with-audio-cue],
[use the specified audio cue device, either ALSA or OSS [use the specified audio cue device, either ALSA or OSS
(plughw:0)]), (default)]),
[AUDIO_CUE=${withval}], [AUDIO_CUE=plughw:0]) [AUDIO_CUE=${withval}], [AUDIO_CUE=default])
AC_MSG_RESULT([using audio cue device: ${AUDIO_CUE}]) AC_MSG_RESULT([using audio cue device: ${AUDIO_CUE}])

4
livesupport/src/products/gLiveSupport/etc/gLiveSupport.xml
View file

@ -157,13 +157,13 @@
<outputPlayer> <outputPlayer>
<audioPlayer> <audioPlayer>
<gstreamerPlayer audioDevice = "plughw:0,0" /> <gstreamerPlayer audioDevice = "default" />
</audioPlayer> </audioPlayer>
</outputPlayer> </outputPlayer>
<cuePlayer> <cuePlayer>
<audioPlayer> <audioPlayer>
<gstreamerPlayer audioDevice = "plughw:0,0" /> <gstreamerPlayer audioDevice = "default" />
</audioPlayer> </audioPlayer>
</cuePlayer> </cuePlayer>

4
livesupport/src/products/scheduler/etc/configure.ac
View file

@ -259,8 +259,8 @@ AC_SUBST(AUDIO_OUT)
AC_ARG_WITH([audio-out], AC_ARG_WITH([audio-out],
AC_HELP_STRING([--with-audio-out], AC_HELP_STRING([--with-audio-out],
[use the specified audio output device, either ALSA or OSS [use the specified audio output device, either ALSA or OSS
(plughw:0)]), (default)]),
[AUDIO_OUT=${withval}], [AUDIO_OUT=plughw:0]) [AUDIO_OUT=${withval}], [AUDIO_OUT=default])
AC_MSG_RESULT([using audio output device: ${AUDIO_OUT}]) AC_MSG_RESULT([using audio output device: ${AUDIO_OUT}])

2
livesupport/src/products/scheduler/etc/scheduler-local.xml
View file

@ -134,7 +134,7 @@
</backupFactory> </backupFactory>
<audioPlayer> <audioPlayer>
<gstreamerPlayer audioDevice = "plughw:0,0" /> <gstreamerPlayer audioDevice = "default" />
</audioPlayer> </audioPlayer>
<xmlRpcDaemon xmlRpcHost = "localhost" <xmlRpcDaemon xmlRpcHost = "localhost"

2
livesupport/src/products/scheduler/etc/scheduler.xml
View file

@ -119,7 +119,7 @@
</backupFactory> </backupFactory>
<audioPlayer> <audioPlayer>
<gstreamerPlayer audioDevice = "plughw:0,0" /> <gstreamerPlayer audioDevice = "default" />
</audioPlayer> </audioPlayer>
<xmlRpcDaemon xmlRpcHost = "localhost" <xmlRpcDaemon xmlRpcHost = "localhost"