Index: openacs-4/etc/install/install.sh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/install/install.sh,v
diff -u -r1.31 -r1.32
--- openacs-4/etc/install/install.sh	19 Nov 2003 13:41:39 -0000	1.31
+++ openacs-4/etc/install/install.sh	19 Nov 2003 14:27:21 -0000	1.32
@@ -199,7 +199,9 @@
 restart_server_command=`get_config_param restart_server_command`
 startup_seconds=`get_config_param startup_seconds`
 shutdown_seconds=`get_config_param shutdown_seconds`
-restart_seconds=$(expr $startup_seconds + $shutdown_seconds)
+startup_loop_count=`get_config_param startup_loop_count`
+restart_loop_count=`get_config_param restart_loop_count`
+shutdown_loop_count=`get_config_param shutdown_loop_count`
 dotlrn_demo_data=`get_config_param dotlrn_demo_data`
 crawl_links=`get_config_param crawl_links`
 aolserver_user=`get_config_param aolserver_user`
@@ -254,7 +256,7 @@
 
 # Wait in a finite loop for the server to come down
 x=0
-while test "$x" -lt 10 ; do
+while test "$x" -lt $shutdown_loop_count ; do
 
     pid=`grep_for_pid "nsd.*$serverroot"`
     if [ "$pid" == "" ]; then
@@ -445,7 +447,7 @@
     rm ${script_path}/success
 fi
 x=0
-while test "$x" -lt 50 ; do
+while test "$x" -lt $startup_loop_count ; do
 
     # check for static file
     echo "$(date): attempting: wget --tries=1 $wget_test"
@@ -454,7 +456,7 @@
 	echo "$(date): Server is up"
 	break
     fi
-    echo "$(date): Waiting for $restart_seconds seconds for server to respond."
+    echo "$(date): Waiting for $startup_seconds seconds for server to respond."
     sleep $startup_seconds
     x=`expr "$x" + 1`
 done
@@ -496,7 +498,7 @@
   fi
   # Wait in a finite loop for the server to become responsive
   x=0
-  while test "$x" -lt 50 ; do
+  while test "$x" -lt $restart_loop_count ; do
       # check for database responsiveness
       wget_test=${server_url}/SYSTEM/dbtest
       echo "$(date): trying to retrieve $wget_test"
@@ -505,8 +507,8 @@
 	  echo "$(date): Server is up"
 	  break
       fi
-      echo "$(date): Waiting for $restart_seconds seconds for server to respond."
-      sleep $restart_seconds
+      echo "$(date): Waiting for $startup_seconds seconds for server to respond."
+      sleep $startup_seconds
       x=`expr "$x" + 1`
   done
 
Index: openacs-4/etc/install/install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/install/install.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/etc/install/install.tcl	6 Nov 2003 19:15:47 -0000	1.11
+++ openacs-4/etc/install/install.tcl	19 Nov 2003 14:27:21 -0000	1.12
@@ -189,13 +189,16 @@
 set stop_server_command "killall nsd"
 set restart_server_command "${stop_server_command}; ${start_server_command}"
 
-# Estimated number of seconds from the startup command is executed until the server is actually up
-set startup_seconds 20
-# Estimated number of seconds from the shutdown command is executed until the server is actually down
-set shutdown_seconds 10
+# Number of loops and seconds per loop while waiting for the server to start
+# or restart
+set startup_seconds 10
+set startup_loop_count 30
+set restart_loop_count 50
 
+# Number of loops and seconds per loop while waiting for the server to stop
+set shutdown_seconds 5
+set shutdown_loop_count 10
 
-
 #----------------------------------------------------------------------
 # OpenACS configuration options
 #----------------------------------------------------------------------