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

5
campcaster/bin/user_setup.sh
View File

@ -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
@ -122,6 +123,7 @@ echo "";
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";
@ -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

5
campcaster/etc/Makefile.in
View File

@ -65,6 +65,7 @@ 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@
@ -267,7 +268,8 @@ ${TMP_DIR}/modules_setup.stamp:
--with-database=${DATABASE} \
--with-database-user=${DB_USER} \
--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} && \
./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} \

15
campcaster/etc/configure.ac
View File

@ -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-----------------------------------------------------------------------------
@ -372,6 +386,7 @@ using the following configuration settings:
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}

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

@ -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])
[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
@ -214,6 +215,7 @@ AC_MSG_NOTICE(
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}
])

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

@ -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(

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

@ -69,6 +69,7 @@ STORAGE_TMP_DIR = "/tmp"
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@
@ -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}

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

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

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

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

15
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}])
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-----------------------------------------------------------------------------
@ -296,6 +310,7 @@ AC_MSG_NOTICE(
hostname: ${HOSTNAME}
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}