fixed #2017

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
 #-------------------------------------------------------------------------------

campcaster/doc/developmentTools.html

@@ -60,6 +60,7 @@ environment variable WANT_AUTOCONF_2_5="1" before compiling the tools.)</li>
   <!-- to compile gstreamer; end -->
   <li><a href="http://ltp.sourceforge.net/coverage/lcov.php">lcov</a> &gt;= 1.4</li>
   </li>
+  <li><a href="http://sourceforge.net/projects/pwgen">pwgen</a></li>
 </ul>
 
 

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-init-database=${INIT_LS_DATABASE}
-                    --with-scheduler-storage-pass=${SCHEDULER_STORAGE_PASS}
 	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} \

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}

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,

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_port/${SCHEDULER_PORT}/;"
-     		  s/ls_scheduler_storage_pass/${SCHEDULER_STORAGE_PASS}/;"
 
 
 #-------------------------------------------------------------------------------

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}
 
 ])
 

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_port/${SCHEDULER_PORT}/;"
-              s/ls_scheduler_storage_pass/${SCHEDULER_STORAGE_PASS}/;"
 
 VPATH    = ${SRC_DIR}
 

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}