Index: openacs-4/etc/install/install.sh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/install/install.sh,v
diff -u -r1.32 -r1.33
--- openacs-4/etc/install/install.sh	19 Nov 2003 14:27:21 -0000	1.32
+++ openacs-4/etc/install/install.sh	19 Nov 2003 15:26:10 -0000	1.33
@@ -489,6 +489,11 @@
       $start_server_command
   fi
 
+  # Peter: it seems nsunix will trigger a restart of the server after we request
+  # the SYSTEM/dbtest page, so give the server some extra time here to potentially restart
+  # again before we proceed
+  sleep 30
+
   # we check for dbtest instead of success here because dbtest is a more thorough test
   # we would have used dbtest before but it doesn't work on postgresql before openacs
   # install
@@ -547,6 +552,7 @@
 
   #-------------------------------------------------------------------
   # Run the Tcl API tests
+  echo "$(date): Running tclwebtest tests"
   ${tclwebtest_dir}/tclwebtest -config_file $config_file tcl-api-test.test
 
   if [ $database == "postgres" ]; then
Index: openacs-4/etc/install/install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/install/install.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/etc/install/install.tcl	19 Nov 2003 14:27:21 -0000	1.12
+++ openacs-4/etc/install/install.tcl	19 Nov 2003 15:26:10 -0000	1.13
@@ -10,55 +10,55 @@
 # It will be used as the name of directories, the name of database
 # users and/or tablespaces, etc.
 
-set server                    "service0"
+set server                    "peter"
 
 #---------------------------------------------------------------------
 # Server root directory. This is where all of the files for your server 
 # will live.
 
-set serverroot                "/var/lib/aolserver/${server}"
+set serverroot                "/web/${server}"
 
 #---------------------------------------------------------------------
 # The host name (DNS) the server will be listening on
-set server_host               yourserver.test
+set server_host               peter.cph02.collaboraid.net
 
 #---------------------------------------------------------------------
 # The IP address the server will be listening on
-set server_ip                 127.0.0.1
+set server_ip                 213.150.51.65
 
 #---------------------------------------------------------------------
 # The port number the server will be listening on
-set server_port               8000
+set server_port               8017
 
 #---------------------------------------------------------------------
 # The URL where your server will be accessible. 
 # This is used by the installation scripts to complete the installation.
 # Don't forget to include the port number above
-set server_url                "http://${server_ip}:${server_port}"
+#set server_url                "http://${server_ip}:${server_port}"
+set server_url                 "http://$server_host"
 
 #---------------------------------------------------------------------
 # OS user and group that AOLserver runs as. We recommend that you
 # create a new user for your server.
 # If you do not want to do that, change the user name below
-set aolserver_user            ${server}
+set aolserver_user            nsadmin
 set aolserver_group           "web"
-
 #---------------------------------------------------------------------
 # OpenACS configuration
-set admin_email               "admin@${server_host}"
-set admin_username            "admin"
-set admin_first_names         "Admin"
-set admin_last_name           "User"
+set admin_email               "peter@collaboraid.biz"
+set admin_username            "peter"
+set admin_first_names         "Peter"
+set admin_last_name           "Marklund"
 set admin_password            "1"
-set system_name               "An OpenACS Development Server"
-set publisher_name            "An OpenACS Developer"
+set system_name               "Peter Dev Server"
+set publisher_name            "Collaboraid"
 
 #---------------------------------------------------------------------
 # Should we automatically grab the OpenACS code from CVS?
 # If not, you must have already unpacked a tar-ball in the server root
 # directory specified above
 
-set do_checkout               "yes"
+set do_checkout               "no"
 
 #---------------------------------------------------------------------
 # Which branch or symbolic tag should we use for the checkout
@@ -152,7 +152,7 @@
 #######################################################################
 
 # Path to AOLserver config.tcl file to use. If you don't specify any file here, we will use the default config file.
-set aolserver_config_file     ""
+set aolserver_config_file     "/web/$server/log/error/current"
 
 # The path to the server's error log file, so we can look for errors during installation
 set error_log_file            "${serverroot}/log/error.log"