From d45efa6e23a2664d2ce810c517bd32ca2773ca2e Mon Sep 17 00:00:00 2001 From: fgerlits Date: Mon, 4 Dec 2006 11:59:01 +0000 Subject: [PATCH] Fixed #2017. --- campcaster/bin/user_setup.sh | 29 +++++++----- campcaster/etc/Makefile.in | 47 ++++++++++--------- campcaster/etc/configure.ac | 47 ++++++++++++------- .../modules/storageServer/etc/configure.ac | 30 ++++++------ .../src/modules/storageServer/var/conf.php | 4 +- .../src/products/scheduler/etc/Makefile.in | 20 ++++---- .../scheduler/etc/campcaster-scheduler.xml | 2 +- .../etc/campcaster-scheduler.xml.template | 2 +- .../src/products/scheduler/etc/configure.ac | 37 ++++++++++----- 9 files changed, 129 insertions(+), 89 deletions(-) diff --git a/campcaster/bin/user_setup.sh b/campcaster/bin/user_setup.sh index 12d1e7d18..f8d7dfd56 100755 --- a/campcaster/bin/user_setup.sh +++ b/campcaster/bin/user_setup.sh @@ -104,6 +104,7 @@ user=`whoami` hostname=localhost http_port=80 scheduler_port=`expr $scheduler_base_port + $UID` +scheduler_storage_pass=change_me dbserver=localhost database=Campcaster-$user dbuser=test @@ -119,18 +120,19 @@ echo "Configuring Campcaster development environment for user $user."; echo ""; echo "Using the following installation parameters:"; echo ""; -echo " host name: $hostname"; -echo " web server port: $http_port"; -echo " scheduler port: $scheduler_port"; -echo " database server: $dbserver"; -echo " database: $database"; -echo " database user: $dbuser"; -echo " database user password: $dbpassword"; -echo " apache daemon group: $apache_group"; -echo " home directory: $homedir"; -echo " configuration directory: $configdir"; -echo " web base directory: $htmldir"; -echo " output audio device: $output_device"; +echo " host name: $hostname"; +echo " web server port: $http_port"; +echo " scheduler port: $scheduler_port"; +echo " storage password for the scheduler: $scheduler_storage_pass"; +echo " database server: $dbserver"; +echo " database: $database"; +echo " database user: $dbuser"; +echo " database user password: $dbpassword"; +echo " apache daemon group: $apache_group"; +echo " home directory: $homedir"; +echo " configuration directory: $configdir"; +echo " web base directory: $htmldir"; +echo " output audio device: $output_device"; 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_cue_device/$ls_audio_cue_device/; \ 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 $replace_sed_string echo diff --git a/campcaster/etc/Makefile.in b/campcaster/etc/Makefile.in index ff6fe3f1a..165c42937 100644 --- a/campcaster/etc/Makefile.in +++ b/campcaster/etc/Makefile.in @@ -60,22 +60,23 @@ USR_ETC_DIR = ${USR_DIR}/etc USR_LIB_DIR = ${USR_DIR}/lib USR_VAR_DIR = ${USR_DIR}/var -HOSTNAME = @HOSTNAME@ -APACHE_GROUP = @APACHE_GROUP@ -WWW_DOCROOT = @WWW_DOCROOT@ -WWW_PORT = @WWW_PORT@ -SCHEDULER_PORT = @SCHEDULER_PORT@ +HOSTNAME = @HOSTNAME@ +APACHE_GROUP = @APACHE_GROUP@ +WWW_DOCROOT = @WWW_DOCROOT@ +WWW_PORT = @WWW_PORT@ +SCHEDULER_PORT = @SCHEDULER_PORT@ +SCHEDULER_STORAGE_PASS = @SCHEDULER_STORAGE_PASS@ DB_SERVER = @DB_SERVER@ -DATABASE = @DATABASE@ -DB_USER = @DB_USER@ -DB_PASSWORD = @DB_PASSWORD@ +DATABASE = @DATABASE@ +DB_USER = @DB_USER@ +DB_PASSWORD = @DB_PASSWORD@ 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@ CONFIGURE_APACHE = @CONFIGURE_APACHE@ -STATION_AUDIO_OUT = "@STATION_AUDIO_OUT@" -STUDIO_AUDIO_OUT = "@STUDIO_AUDIO_OUT@" -STUDIO_AUDIO_CUE = "@STUDIO_AUDIO_CUE@" +STATION_AUDIO_OUT = "@STATION_AUDIO_OUT@" +STUDIO_AUDIO_OUT = "@STUDIO_AUDIO_OUT@" +STUDIO_AUDIO_CUE = "@STUDIO_AUDIO_CUE@" 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-phppart-dir=${prefix}/var/Campcaster/storageAdmin cd ${STORAGE_SERVER_DIR} && \ - ./configure --prefix=${prefix} \ - --with-apache-group=${APACHE_GROUP} \ - --with-hostname=${HOSTNAME} \ + ./configure --prefix=${prefix} \ + --with-apache-group=${APACHE_GROUP} \ + --with-hostname=${HOSTNAME} \ --with-www-docroot=${WWW_DOCROOT} \ - --with-www-port=${WWW_PORT} \ - --with-scheduler-port=${SCHEDULER_PORT} \ - --with-database-server=${DB_SERVER} \ - --with-database=${DATABASE} \ - --with-database-user=${DB_USER} \ - --with-database-password=${DB_PASSWORD} \ - --with-init-database=${INIT_LS_DATABASE} + --with-www-port=${WWW_PORT} \ + --with-scheduler-port=${SCHEDULER_PORT} \ + --with-database-server=${DB_SERVER} \ + --with-database=${DATABASE} \ + --with-database-user=${DB_USER} \ + --with-database-password=${DB_PASSWORD} \ + --with-init-database=${INIT_LS_DATABASE} \ + --with-scheduler-storage-pass=${SCHEDULER_STORAGE_PASS} cd ${CORE_DIR} && \ ./configure --prefix=${prefix} --enable-debug=${DEBUG} cd ${AUTHENTICATION_DIR} && \ @@ -296,6 +298,7 @@ ${TMP_DIR}/products_setup.stamp: --with-hostname=${HOSTNAME} \ --with-www-port=${WWW_PORT} \ --with-scheduler-port=${SCHEDULER_PORT} \ + --with-scheduler-storage-pass=${SCHEDULER_STORAGE_PASS} \ --with-database-server=${DB_SERVER} \ --with-database=${DATABASE} \ --with-database-user=${DB_USER} \ diff --git a/campcaster/etc/configure.ac b/campcaster/etc/configure.ac index e352aa932..1298f9103 100644 --- a/campcaster/etc/configure.ac +++ b/campcaster/etc/configure.ac @@ -181,6 +181,20 @@ AC_ARG_WITH([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 specify the database server name dnl----------------------------------------------------------------------------- @@ -367,22 +381,23 @@ by Campcaster: using the following configuration settings: - hostname: ${HOSTNAME} - apache group: ${APACHE_GROUP} - www document root: ${WWW_DOCROOT} - www port: ${WWW_PORT} - scheduler port: ${SCHEDULER_PORT} - database server: ${DB_SERVER} - database name: ${DATABASE} - database user: ${DB_USER} - database user password: ${DB_PASSWORD} - station audio output device: ${STATION_AUDIO_OUT} - studio audio output device: ${STUDIO_AUDIO_OUT} - studio audio cue device: ${STUDIO_AUDIO_CUE} - creating Campcaster database: ${CREATE_LS_DATABASE} - creating ODBC data source: ${CREATE_ODBC_DATA_SOURCE} - initialize Campcaster database: ${INIT_LS_DATABASE} - configuring apache: ${CONFIGURE_APACHE} + hostname: ${HOSTNAME} + apache group: ${APACHE_GROUP} + www document root: ${WWW_DOCROOT} + www port: ${WWW_PORT} + scheduler port: ${SCHEDULER_PORT} + storage password for the scheduler: ${SCHEDULER_STORAGE_PASS} + database server: ${DB_SERVER} + database name: ${DATABASE} + database user: ${DB_USER} + database user password: ${DB_PASSWORD} + station audio output device: ${STATION_AUDIO_OUT} + studio audio output device: ${STUDIO_AUDIO_OUT} + studio audio cue device: ${STUDIO_AUDIO_CUE} + creating Campcaster database: ${CREATE_LS_DATABASE} + creating ODBC data source: ${CREATE_ODBC_DATA_SOURCE} + initialize Campcaster database: ${INIT_LS_DATABASE} + configuring apache: ${CONFIGURE_APACHE} ]) diff --git a/campcaster/src/modules/storageServer/etc/configure.ac b/campcaster/src/modules/storageServer/etc/configure.ac index ea967bed6..d78fa15af 100644 --- a/campcaster/src/modules/storageServer/etc/configure.ac +++ b/campcaster/src/modules/storageServer/etc/configure.ac @@ -187,16 +187,17 @@ AC_MSG_RESULT([using www document root: ${WWW_DOCROOT}]) dnl----------------------------------------------------------------------------- -dnl specify web document root +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]) + [set password for scheduler access to storage (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 @@ -204,16 +205,17 @@ dnl display status info on what libraries will get compiled AC_MSG_NOTICE( [using the following configuration settings: - hostname: ${HOSTNAME} - www port: ${WWW_PORT} - scheduler port: ${SCHEDULER_PORT} - database server: ${DB_SERVER} - database name: ${DATABASE} - database user: ${DB_USER} - database user password: ${DB_PASSWORD} - creating Campcaster database: ${CREATE_LS_DATABASE} - initialize Campcaster database: ${INIT_LS_DATABASE} - www document root: ${WWW_DOCROOT} + hostname: ${HOSTNAME} + www port: ${WWW_PORT} + scheduler port: ${SCHEDULER_PORT} + database server: ${DB_SERVER} + database name: ${DATABASE} + database user: ${DB_USER} + database user password: ${DB_PASSWORD} + creating Campcaster database: ${CREATE_LS_DATABASE} + initialize Campcaster database: ${INIT_LS_DATABASE} + www document root: ${WWW_DOCROOT} + storage password for the scheduler: ${SCHEDULER_STORAGE_PASS} ]) diff --git a/campcaster/src/modules/storageServer/var/conf.php b/campcaster/src/modules/storageServer/var/conf.php index 4b41e39a0..d88bcef33 100644 --- a/campcaster/src/modules/storageServer/var/conf.php +++ b/campcaster/src/modules/storageServer/var/conf.php @@ -87,7 +87,7 @@ $config = array( 'schedulerXMLRPC' => 'RC2', 'schedulerUrlHost' => 'localhost', 'schedulerUrlPort' => 3344, - 'schedulerPass' => 'ls_scheduler_storage_pass', + 'schedulerPass' => 'change_me', /* ==================================== aplication-specific configuration */ 'objtypes' => array( @@ -164,4 +164,4 @@ foreach (array('storageDir', 'bufferDir', 'transDir', 'accessDir', 'pearPath', ' $config[$d] = $rp; } -?> \ No newline at end of file +?> diff --git a/campcaster/src/products/scheduler/etc/Makefile.in b/campcaster/src/products/scheduler/etc/Makefile.in index aec4b2a23..9bbadb4f2 100644 --- a/campcaster/src/products/scheduler/etc/Makefile.in +++ b/campcaster/src/products/scheduler/etc/Makefile.in @@ -66,14 +66,15 @@ USR_LIB_DIR = ${USR_DIR}/lib USR_TMP_DIR = ${USR_DIR}/tmp STORAGE_TMP_DIR = "/tmp" -HOSTNAME = @HOSTNAME@ -WWW_PORT = @WWW_PORT@ -SCHEDULER_PORT = @SCHEDULER_PORT@ -DB_SERVER = @DB_SERVER@ -DATABASE = @DATABASE@ -DB_USER = @DB_USER@ -DB_PASSWORD = @DB_PASSWORD@ -AUDIO_OUT = "@AUDIO_OUT@" +HOSTNAME = @HOSTNAME@ +WWW_PORT = @WWW_PORT@ +SCHEDULER_PORT = @SCHEDULER_PORT@ +SCHEDULER_STORAGE_PASS = @SCHEDULER_STORAGE_PASS@ +DB_SERVER = @DB_SERVER@ +DATABASE = @DATABASE@ +DB_USER = @DB_USER@ +DB_PASSWORD = @DB_PASSWORD@ +AUDIO_OUT = "@AUDIO_OUT@" PHP_URL_PREFIX=campcaster 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_audio_output_device/${AUDIO_OUT_S}/; \ 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} diff --git a/campcaster/src/products/scheduler/etc/campcaster-scheduler.xml b/campcaster/src/products/scheduler/etc/campcaster-scheduler.xml index 196052770..46c89727c 100644 --- a/campcaster/src/products/scheduler/etc/campcaster-scheduler.xml +++ b/campcaster/src/products/scheduler/etc/campcaster-scheduler.xml @@ -83,7 +83,7 @@ ]> - + - +