Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed #2017.

This commit is contained in:
fgerlits 2006-12-04 11:59:01 +00:00
parent 0fb1c29f2c
commit d45efa6e23
9 changed files with 129 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
campcaster/bin/user_setup.sh
View File

@ -104,6 +104,7 @@ user=`whoami`
hostname=localhost hostname=localhost
http_port=80 http_port=80
scheduler_port=`expr $scheduler_base_port + $UID` scheduler_port=`expr $scheduler_base_port + $UID`
scheduler_storage_pass=change_me
dbserver=localhost dbserver=localhost
database=Campcaster-$user database=Campcaster-$user
dbuser=test dbuser=test
@ -119,18 +120,19 @@ echo "Configuring Campcaster development environment for user $user.";
echo ""; echo "";
echo "Using the following installation parameters:"; echo "Using the following installation parameters:";
echo ""; echo "";
echo " host name: $hostname"; echo " host name: $hostname";
echo " web server port: $http_port"; echo " web server port: $http_port";
echo " scheduler port: $scheduler_port"; echo " scheduler port: $scheduler_port";
echo " database server: $dbserver"; echo " storage password for the scheduler: $scheduler_storage_pass";
echo " database: $database"; echo " database server: $dbserver";
echo " database user: $dbuser"; echo " database: $database";
echo " database user password: $dbpassword"; echo " database user: $dbuser";
echo " apache daemon group: $apache_group"; echo " database user password: $dbpassword";
echo " home directory: $homedir"; echo " apache daemon group: $apache_group";
echo " configuration directory: $configdir"; echo " home directory: $homedir";
echo " web base directory: $htmldir"; echo " configuration directory: $configdir";
echo " output audio device: $output_device"; echo " web base directory: $htmldir";
echo " output audio device: $output_device";
echo "" echo ""
@ -210,7 +212,8 @@ replace_sed_string="s/ls_install_dir/$installdir_s/; \
s/ls_audio_output_device/$ls_audio_output_device/; \ s/ls_audio_output_device/$ls_audio_output_device/; \
s/ls_audio_cue_device/$ls_audio_cue_device/; \ s/ls_audio_cue_device/$ls_audio_cue_device/; \
s/ls_tmp_dir/$ls_tmp_dir_s/; \ s/ls_tmp_dir/$ls_tmp_dir_s/; \
s/ls_scheduler_daemon_command/$ls_scheduler_daemon_command_s/;" s/ls_scheduler_daemon_command/$ls_scheduler_daemon_command_s/; \
s/ls_scheduler_storage_pass/$scheduler_storage_pass/;"
echo echo
echo $replace_sed_string echo $replace_sed_string
echo echo

47
campcaster/etc/Makefile.in
View File

@ -60,22 +60,23 @@ USR_ETC_DIR = ${USR_DIR}/etc
USR_LIB_DIR = ${USR_DIR}/lib USR_LIB_DIR = ${USR_DIR}/lib
USR_VAR_DIR = ${USR_DIR}/var USR_VAR_DIR = ${USR_DIR}/var
HOSTNAME = @HOSTNAME@ HOSTNAME = @HOSTNAME@
APACHE_GROUP = @APACHE_GROUP@ APACHE_GROUP = @APACHE_GROUP@
WWW_DOCROOT = @WWW_DOCROOT@ WWW_DOCROOT = @WWW_DOCROOT@
WWW_PORT = @WWW_PORT@ WWW_PORT = @WWW_PORT@
SCHEDULER_PORT = @SCHEDULER_PORT@ SCHEDULER_PORT = @SCHEDULER_PORT@
SCHEDULER_STORAGE_PASS = @SCHEDULER_STORAGE_PASS@
DB_SERVER = @DB_SERVER@ DB_SERVER = @DB_SERVER@
DATABASE = @DATABASE@ DATABASE = @DATABASE@
DB_USER = @DB_USER@ DB_USER = @DB_USER@
DB_PASSWORD = @DB_PASSWORD@ DB_PASSWORD = @DB_PASSWORD@
CREATE_LS_DATABASE = @CREATE_LS_DATABASE@ CREATE_LS_DATABASE = @CREATE_LS_DATABASE@
INIT_LS_DATABASE = @INIT_LS_DATABASE@ INIT_LS_DATABASE = @INIT_LS_DATABASE@
CREATE_ODBC_DATA_SOURCE = @CREATE_ODBC_DATA_SOURCE@ CREATE_ODBC_DATA_SOURCE = @CREATE_ODBC_DATA_SOURCE@
CONFIGURE_APACHE = @CONFIGURE_APACHE@ CONFIGURE_APACHE = @CONFIGURE_APACHE@
STATION_AUDIO_OUT = "@STATION_AUDIO_OUT@" STATION_AUDIO_OUT = "@STATION_AUDIO_OUT@"
STUDIO_AUDIO_OUT = "@STUDIO_AUDIO_OUT@" STUDIO_AUDIO_OUT = "@STUDIO_AUDIO_OUT@"
STUDIO_AUDIO_CUE = "@STUDIO_AUDIO_CUE@" STUDIO_AUDIO_CUE = "@STUDIO_AUDIO_CUE@"
export LD_LIBRARY_PATH:=${prefix}/lib:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH:=${prefix}/lib:${LD_LIBRARY_PATH}
@ -257,17 +258,18 @@ ${TMP_DIR}/modules_setup.stamp:
--with-storage-server=${prefix}/var/Campcaster/storageServer \ --with-storage-server=${prefix}/var/Campcaster/storageServer \
--with-phppart-dir=${prefix}/var/Campcaster/storageAdmin --with-phppart-dir=${prefix}/var/Campcaster/storageAdmin
cd ${STORAGE_SERVER_DIR} && \ cd ${STORAGE_SERVER_DIR} && \
./configure --prefix=${prefix} \ ./configure --prefix=${prefix} \
--with-apache-group=${APACHE_GROUP} \ --with-apache-group=${APACHE_GROUP} \
--with-hostname=${HOSTNAME} \ --with-hostname=${HOSTNAME} \
--with-www-docroot=${WWW_DOCROOT} \ --with-www-docroot=${WWW_DOCROOT} \
--with-www-port=${WWW_PORT} \ --with-www-port=${WWW_PORT} \
--with-scheduler-port=${SCHEDULER_PORT} \ --with-scheduler-port=${SCHEDULER_PORT} \
--with-database-server=${DB_SERVER} \ --with-database-server=${DB_SERVER} \
--with-database=${DATABASE} \ --with-database=${DATABASE} \
--with-database-user=${DB_USER} \ --with-database-user=${DB_USER} \
--with-database-password=${DB_PASSWORD} \ --with-database-password=${DB_PASSWORD} \
--with-init-database=${INIT_LS_DATABASE} --with-init-database=${INIT_LS_DATABASE} \
--with-scheduler-storage-pass=${SCHEDULER_STORAGE_PASS}
cd ${CORE_DIR} && \ cd ${CORE_DIR} && \
./configure --prefix=${prefix} --enable-debug=${DEBUG} ./configure --prefix=${prefix} --enable-debug=${DEBUG}
cd ${AUTHENTICATION_DIR} && \ cd ${AUTHENTICATION_DIR} && \
@ -296,6 +298,7 @@ ${TMP_DIR}/products_setup.stamp:
--with-hostname=${HOSTNAME} \ --with-hostname=${HOSTNAME} \
--with-www-port=${WWW_PORT} \ --with-www-port=${WWW_PORT} \
--with-scheduler-port=${SCHEDULER_PORT} \ --with-scheduler-port=${SCHEDULER_PORT} \
--with-scheduler-storage-pass=${SCHEDULER_STORAGE_PASS} \
--with-database-server=${DB_SERVER} \ --with-database-server=${DB_SERVER} \
--with-database=${DATABASE} \ --with-database=${DATABASE} \
--with-database-user=${DB_USER} \ --with-database-user=${DB_USER} \

47
campcaster/etc/configure.ac
View File

@ -181,6 +181,20 @@ AC_ARG_WITH([scheduler-port],
AC_MSG_RESULT([using scheduler port: ${SCHEDULER_PORT}]) AC_MSG_RESULT([using scheduler port: ${SCHEDULER_PORT}])
dnl-----------------------------------------------------------------------------
dnl specify the storage password for the scheduler user
dnl-----------------------------------------------------------------------------
AC_SUBST(SCHEDULER_STORAGE_PASS)
AC_ARG_WITH([scheduler-storage-pass],
AC_HELP_STRING([--with-scheduler-storage-pass],
[set password for scheduler access to storage (change_me)]),
[SCHEDULER_STORAGE_PASS=${withval}],
[SCHEDULER_STORAGE_PASS=change_me])
AC_MSG_RESULT([storage password for the scheduler: ${SCHEDULER_STORAGE_PASS}])
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
dnl specify the database server name dnl specify the database server name
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
@ -367,22 +381,23 @@ by Campcaster:
using the following configuration settings: using the following configuration settings:
hostname: ${HOSTNAME} hostname: ${HOSTNAME}
apache group: ${APACHE_GROUP} apache group: ${APACHE_GROUP}
www document root: ${WWW_DOCROOT} www document root: ${WWW_DOCROOT}
www port: ${WWW_PORT} www port: ${WWW_PORT}
scheduler port: ${SCHEDULER_PORT} scheduler port: ${SCHEDULER_PORT}
database server: ${DB_SERVER} storage password for the scheduler: ${SCHEDULER_STORAGE_PASS}
database name: ${DATABASE} database server: ${DB_SERVER}
database user: ${DB_USER} database name: ${DATABASE}
database user password: ${DB_PASSWORD} database user: ${DB_USER}
station audio output device: ${STATION_AUDIO_OUT} database user password: ${DB_PASSWORD}
studio audio output device: ${STUDIO_AUDIO_OUT} station audio output device: ${STATION_AUDIO_OUT}
studio audio cue device: ${STUDIO_AUDIO_CUE} studio audio output device: ${STUDIO_AUDIO_OUT}
creating Campcaster database: ${CREATE_LS_DATABASE} studio audio cue device: ${STUDIO_AUDIO_CUE}
creating ODBC data source: ${CREATE_ODBC_DATA_SOURCE} creating Campcaster database: ${CREATE_LS_DATABASE}
initialize Campcaster database: ${INIT_LS_DATABASE} creating ODBC data source: ${CREATE_ODBC_DATA_SOURCE}
configuring apache: ${CONFIGURE_APACHE} initialize Campcaster database: ${INIT_LS_DATABASE}
configuring apache: ${CONFIGURE_APACHE}
]) ])

30
campcaster/src/modules/storageServer/etc/configure.ac
View File

@ -187,16 +187,17 @@ AC_MSG_RESULT([using www document root: ${WWW_DOCROOT}])
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
dnl specify web document root dnl specify the storage password for the scheduler user
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
AC_SUBST(SCHEDULER_STORAGE_PASS) AC_SUBST(SCHEDULER_STORAGE_PASS)
AC_ARG_WITH([scheduler-storage-pass], AC_ARG_WITH([scheduler-storage-pass],
AC_HELP_STRING([--with-scheduler-storage-pass], AC_HELP_STRING([--with-scheduler-storage-pass],
[set password for scheduler access to storage (change_me)]), [set password for scheduler access to storage (change_me)]),
[SCHEDULER_STORAGE_PASS=${withval}], [SCHEDULER_STORAGE_PASS=change_me]) [SCHEDULER_STORAGE_PASS=${withval}],
[SCHEDULER_STORAGE_PASS=change_me])
AC_MSG_RESULT([scheduler password to storage: ${SCHEDULER_STORAGE_PASS}]) AC_MSG_RESULT([storage password for the scheduler: ${SCHEDULER_STORAGE_PASS}])
dnl display status info on what libraries will get compiled dnl display status info on what libraries will get compiled
@ -204,16 +205,17 @@ dnl display status info on what libraries will get compiled
AC_MSG_NOTICE( AC_MSG_NOTICE(
[using the following configuration settings: [using the following configuration settings:
hostname: ${HOSTNAME} hostname: ${HOSTNAME}
www port: ${WWW_PORT} www port: ${WWW_PORT}
scheduler port: ${SCHEDULER_PORT} scheduler port: ${SCHEDULER_PORT}
database server: ${DB_SERVER} database server: ${DB_SERVER}
database name: ${DATABASE} database name: ${DATABASE}
database user: ${DB_USER} database user: ${DB_USER}
database user password: ${DB_PASSWORD} database user password: ${DB_PASSWORD}
creating Campcaster database: ${CREATE_LS_DATABASE} creating Campcaster database: ${CREATE_LS_DATABASE}
initialize Campcaster database: ${INIT_LS_DATABASE} initialize Campcaster database: ${INIT_LS_DATABASE}
www document root: ${WWW_DOCROOT} www document root: ${WWW_DOCROOT}
storage password for the scheduler: ${SCHEDULER_STORAGE_PASS}
]) ])

4
campcaster/src/modules/storageServer/var/conf.php
View File

@ -87,7 +87,7 @@ $config = array(
'schedulerXMLRPC' => 'RC2', 'schedulerXMLRPC' => 'RC2',
'schedulerUrlHost' => 'localhost', 'schedulerUrlHost' => 'localhost',
'schedulerUrlPort' => 3344, 'schedulerUrlPort' => 3344,
'schedulerPass' => 'ls_scheduler_storage_pass', 'schedulerPass' => 'change_me',
/* ==================================== aplication-specific configuration */ /* ==================================== aplication-specific configuration */
'objtypes' => array( 'objtypes' => array(
@ -164,4 +164,4 @@ foreach (array('storageDir', 'bufferDir', 'transDir', 'accessDir', 'pearPath', '
$config[$d] = $rp; $config[$d] = $rp;
} }
?> ?>

20
campcaster/src/products/scheduler/etc/Makefile.in
View File

@ -66,14 +66,15 @@ USR_LIB_DIR = ${USR_DIR}/lib
USR_TMP_DIR = ${USR_DIR}/tmp USR_TMP_DIR = ${USR_DIR}/tmp
STORAGE_TMP_DIR = "/tmp" STORAGE_TMP_DIR = "/tmp"
HOSTNAME = @HOSTNAME@ HOSTNAME = @HOSTNAME@
WWW_PORT = @WWW_PORT@ WWW_PORT = @WWW_PORT@
SCHEDULER_PORT = @SCHEDULER_PORT@ SCHEDULER_PORT = @SCHEDULER_PORT@
DB_SERVER = @DB_SERVER@ SCHEDULER_STORAGE_PASS = @SCHEDULER_STORAGE_PASS@
DATABASE = @DATABASE@ DB_SERVER = @DB_SERVER@
DB_USER = @DB_USER@ DATABASE = @DATABASE@
DB_PASSWORD = @DB_PASSWORD@ DB_USER = @DB_USER@
AUDIO_OUT = "@AUDIO_OUT@" DB_PASSWORD = @DB_PASSWORD@
AUDIO_OUT = "@AUDIO_OUT@"
PHP_URL_PREFIX=campcaster PHP_URL_PREFIX=campcaster
ALIB_XML_RPC_PREFIX=xmlrpc/xrLocStor.php ALIB_XML_RPC_PREFIX=xmlrpc/xrLocStor.php
@ -101,7 +102,8 @@ REPLACE_SED_STRING="s/ls_lib_dir/${USR_LIB_DIR_S}/; \
s/ls_tmp_dir/${STORAGE_TMP_DIR_S}/; \ s/ls_tmp_dir/${STORAGE_TMP_DIR_S}/; \
s/ls_audio_output_device/${AUDIO_OUT_S}/; \ s/ls_audio_output_device/${AUDIO_OUT_S}/; \
s/ls_scheduler_host/${HOSTNAME}/; \ s/ls_scheduler_host/${HOSTNAME}/; \
s/ls_scheduler_port/${SCHEDULER_PORT}/;" s/ls_scheduler_port/${SCHEDULER_PORT}/; \
s/ls_scheduler_storage_pass/${SCHEDULER_STORAGE_PASS}/;"
VPATH = ${SRC_DIR} VPATH = ${SRC_DIR}

2
campcaster/src/products/scheduler/etc/campcaster-scheduler.xml
View File

@ -83,7 +83,7 @@
]> ]>
<scheduler> <scheduler>
<user login="root" password="q" /> <user login="scheduler" password="change_me" />
<connectionManagerFactory> <connectionManagerFactory>
<simpleConnectionManager dsn = "Campcaster-test" <simpleConnectionManager dsn = "Campcaster-test"

2
campcaster/src/products/scheduler/etc/campcaster-scheduler.xml.template
View File

@ -83,7 +83,7 @@
]> ]>
<scheduler> <scheduler>
<user login="root" password="q" /> <user login="scheduler" password="ls_scheduler_storage_pass" />
<connectionManagerFactory> <connectionManagerFactory>
<simpleConnectionManager dsn = "ls_database" <simpleConnectionManager dsn = "ls_database"

37
campcaster/src/products/scheduler/etc/configure.ac
View File

@ -222,6 +222,20 @@ AC_ARG_WITH([scheduler-port],
AC_MSG_RESULT([using scheduler port: ${SCHEDULER_PORT}]) AC_MSG_RESULT([using scheduler port: ${SCHEDULER_PORT}])
dnl-----------------------------------------------------------------------------
dnl specify the storage password for the scheduler user
dnl-----------------------------------------------------------------------------
AC_SUBST(SCHEDULER_STORAGE_PASS)
AC_ARG_WITH([scheduler-storage-pass],
AC_HELP_STRING([--with-scheduler-storage-pass],
[set password for scheduler access to storage (change_me)]),
[SCHEDULER_STORAGE_PASS=${withval}],
[SCHEDULER_STORAGE_PASS=change_me])
AC_MSG_RESULT([storage password for the scheduler: ${SCHEDULER_STORAGE_PASS}])
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
dnl specify the database server name dnl specify the database server name
dnl----------------------------------------------------------------------------- dnl-----------------------------------------------------------------------------
@ -293,17 +307,18 @@ dnl display status info on what libraries will get compiled
AC_MSG_NOTICE( AC_MSG_NOTICE(
[using the following configuration settings: [using the following configuration settings:
hostname: ${HOSTNAME} hostname: ${HOSTNAME}
www port: ${WWW_PORT} www port: ${WWW_PORT}
scheduler port: ${SCHEDULER_PORT} scheduler port: ${SCHEDULER_PORT}
database server: ${DB_SERVER} storage password for the scheduler: ${SCHEDULER_STORAGE_PASS}
database name: ${DATABASE} database server: ${DB_SERVER}
database user: ${DB_USER} database name: ${DATABASE}
database user password: ${DB_PASSWORD} database user: ${DB_USER}
audio output device: ${AUDIO_OUT} database user password: ${DB_PASSWORD}
creating Campcaster database: ${CREATE_LS_DATABASE} audio output device: ${AUDIO_OUT}
creating ODBC data source: ${CREATE_ODBC_DATA_SOURCE} creating Campcaster database: ${CREATE_LS_DATABASE}
initialize Campcaster database: ${INIT_LS_DATABASE} creating ODBC data source: ${CREATE_ODBC_DATA_SOURCE}
initialize Campcaster database: ${INIT_LS_DATABASE}
]) ])