From b56fd1cec2a1701d2e1f8f870562d8155c754620 Mon Sep 17 00:00:00 2001 From: fgerlits Date: Tue, 5 Dec 2006 15:35:29 +0000 Subject: [PATCH] fixed #2017 --- campcaster/bin/postInstallStation.sh | 9 +++++++++ campcaster/doc/developmentTools.html | 1 + campcaster/etc/Makefile.in | 5 +---- campcaster/etc/configure.ac | 15 --------------- campcaster/etc/debian/control | 1 + .../src/modules/storageServer/etc/Makefile.in | 4 +--- .../src/modules/storageServer/etc/configure.ac | 15 --------------- campcaster/src/products/scheduler/etc/Makefile.in | 4 +--- .../src/products/scheduler/etc/configure.ac | 15 --------------- 9 files changed, 14 insertions(+), 55 deletions(-) diff --git a/campcaster/bin/postInstallStation.sh b/campcaster/bin/postInstallStation.sh index da037892e..04eef82c8 100755 --- a/campcaster/bin/postInstallStation.sh +++ b/campcaster/bin/postInstallStation.sh @@ -404,6 +404,15 @@ rm -f ${GST_REGISTRY} $install_bin/gst-register +#------------------------------------------------------------------------------- +# Generate a random password for the scheduler's to access the storage +#------------------------------------------------------------------------------- +SCHEDULER_STORAGE_PASS=`pwgen -N1 -c -n -s` +php -q $install_bin/changeSchedulerPassword.php ${SCHEDULER_STORAGE_PASS} +sed -i -e "s/ls_scheduler_storage_pass/${SCHEDULER_STORAGE_PASS}/" \ + $install_etc/campcaster-scheduler.xml + + #------------------------------------------------------------------------------- # Say goodbye #------------------------------------------------------------------------------- diff --git a/campcaster/doc/developmentTools.html b/campcaster/doc/developmentTools.html index 6b05d19d8..0f29dfecb 100644 --- a/campcaster/doc/developmentTools.html +++ b/campcaster/doc/developmentTools.html @@ -60,6 +60,7 @@ environment variable WANT_AUTOCONF_2_5="1" before compiling the tools.)
  • lcov >= 1.4
    • +
  • pwgen
    • diff --git a/campcaster/etc/Makefile.in b/campcaster/etc/Makefile.in index 165c42937..ee9eb9577 100644 --- a/campcaster/etc/Makefile.in +++ b/campcaster/etc/Makefile.in @@ -65,7 +65,6 @@ 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@ @@ -268,8 +267,7 @@ ${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-scheduler-storage-pass=${SCHEDULER_STORAGE_PASS} + --with-init-database=${INIT_LS_DATABASE} cd ${CORE_DIR} && \ ./configure --prefix=${prefix} --enable-debug=${DEBUG} cd ${AUTHENTICATION_DIR} && \ @@ -298,7 +296,6 @@ ${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 eaa6587c5..7d0346f4f 100644 --- a/campcaster/etc/configure.ac +++ b/campcaster/etc/configure.ac @@ -181,20 +181,6 @@ 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----------------------------------------------------------------------------- @@ -386,7 +372,6 @@ 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} diff --git a/campcaster/etc/debian/control b/campcaster/etc/debian/control index 59357d4e6..8e7656ddb 100644 --- a/campcaster/etc/debian/control +++ b/campcaster/etc/debian/control @@ -92,6 +92,7 @@ Architecture: any Depends: ${shlibs:Depends}, campcaster-libs (= ${dpkg:Version}), sed, + pwgen, unixodbc (>= 2.2), odbc-postgresql, libfontconfig1, diff --git a/campcaster/src/modules/storageServer/etc/Makefile.in b/campcaster/src/modules/storageServer/etc/Makefile.in index 1ecbf7e28..9aa306780 100644 --- a/campcaster/src/modules/storageServer/etc/Makefile.in +++ b/campcaster/src/modules/storageServer/etc/Makefile.in @@ -92,7 +92,6 @@ DB_USER = @DB_USER@ DB_PASSWORD = @DB_PASSWORD@ SCHEDULER_PORT = @SCHEDULER_PORT@ WWW_DOCROOT = @WWW_DOCROOT@ -SCHEDULER_STORAGE_PASS = @SCHEDULER_STORAGE_PASS@ PHP_URL_PREFIX=campcaster SCHEDULER_URL_PREFIX = @@ -114,8 +113,7 @@ REPLACE_SED_STRING="s/ls_lib_dir/${USR_LIB_DIR_S}/; \ s/ls_scheduler_urlPrefix/${SCHEDULER_URL_PREFIX}/; \ s/ls_scheduler_xmlRpcPrefix/${SCHEDULER_XML_RPC_PREFIX}/; \ s/ls_scheduler_host/${HOSTNAME}/; \ - s/ls_scheduler_port/${SCHEDULER_PORT}/; \ - s/ls_scheduler_storage_pass/${SCHEDULER_STORAGE_PASS}/;" + s/ls_scheduler_port/${SCHEDULER_PORT}/;" #------------------------------------------------------------------------------- diff --git a/campcaster/src/modules/storageServer/etc/configure.ac b/campcaster/src/modules/storageServer/etc/configure.ac index af18cb91f..1473063ef 100644 --- a/campcaster/src/modules/storageServer/etc/configure.ac +++ b/campcaster/src/modules/storageServer/etc/configure.ac @@ -186,20 +186,6 @@ AC_ARG_WITH([www-docroot], AC_MSG_RESULT([using www document root: ${WWW_DOCROOT}]) -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 display status info on what libraries will get compiled AC_MSG_NOTICE( @@ -215,7 +201,6 @@ 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} ]) diff --git a/campcaster/src/products/scheduler/etc/Makefile.in b/campcaster/src/products/scheduler/etc/Makefile.in index 9bbadb4f2..d6d1f2d3d 100644 --- a/campcaster/src/products/scheduler/etc/Makefile.in +++ b/campcaster/src/products/scheduler/etc/Makefile.in @@ -69,7 +69,6 @@ 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@ @@ -102,8 +101,7 @@ 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_storage_pass/${SCHEDULER_STORAGE_PASS}/;" + s/ls_scheduler_port/${SCHEDULER_PORT}/;" VPATH = ${SRC_DIR} diff --git a/campcaster/src/products/scheduler/etc/configure.ac b/campcaster/src/products/scheduler/etc/configure.ac index b45473863..5a3ff3c2b 100644 --- a/campcaster/src/products/scheduler/etc/configure.ac +++ b/campcaster/src/products/scheduler/etc/configure.ac @@ -222,20 +222,6 @@ 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----------------------------------------------------------------------------- @@ -310,7 +296,6 @@ 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}