Index: openacs-4/etc/install/README
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/install/README,v
diff -u -r1.4 -r1.5
--- openacs-4/etc/install/README	23 Oct 2003 13:49:29 -0000	1.4
+++ openacs-4/etc/install/README	4 Nov 2003 11:10:28 -0000	1.5
@@ -13,7 +13,7 @@
 
 *** Quick Guide
 
-edit config.tcl
+edit install.tcl
 su -
 ./install.sh
 
@@ -52,9 +52,9 @@
 so that that user can be dropped (i.e. log out of any sqlplus or
 psql sessions you might have).
 
-3) Use the config template config.tcl to create
+3) Use the config template install.tcl to create
    a server specific installation config file. Per default install.sh
-   will use the file config.tcl in the same directory but you can specify
+   will use the file install.tcl in the same directory but you can specify
    any config file on the command line with the switch --config-file.
 
 4) Make sure an AOLServer config file is prepared.  You can use
@@ -68,8 +68,7 @@
 
 7) Fetch a fresh checkout from CVS of TclWebTest (see
 http://tclwebtest.sourceforge.net) and specify the directory the
-tclwebtest executable resides in in your config file (the default
-config file is config.tcl).
+tclwebtest executable resides in in your install.tcl file.
 
 *** FAQ
 
Index: openacs-4/etc/install/install-and-alert.sh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/install/install-and-alert.sh,v
diff -u -r1.4 -r1.5
--- openacs-4/etc/install/install-and-alert.sh	10 Sep 2003 09:57:12 -0000	1.4
+++ openacs-4/etc/install/install-and-alert.sh	4 Nov 2003 11:10:29 -0000	1.5
@@ -24,7 +24,7 @@
 # before we load the config file
 config_val_next=0
 server_next=0
-export config_file="config.tcl"
+export config_file="install.tcl"
 server_overridden="no"
 for arg in "$@"
   do
Index: openacs-4/etc/install/install.sh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/install/install.sh,v
diff -u -r1.21 -r1.22
--- openacs-4/etc/install/install.sh	22 Oct 2003 09:52:43 -0000	1.21
+++ openacs-4/etc/install/install.sh	4 Nov 2003 11:10:29 -0000	1.22
@@ -10,6 +10,8 @@
 #   .LRN over HTTP that is normally done manually in a browser.
 #
 # @author Peter Marklund (peter@collaboraid.biz)
+# @author Lars Pind (lars@collaboraid.biz)
+# @author Joel Aufrecht (joel@aufrecht.org)
 
 # DEBUG: If any command fails - exit
 set -e
@@ -40,7 +42,7 @@
 # before we load the config file
 config_val_next=0
 server_next=0
-export config_file="config.tcl"
+export config_file="install.tcl"
 server_overridden="no"
 for arg in "$@"
   do
@@ -72,7 +74,7 @@
 
 usage="$0 [OPTIONS]
     --server      Server name.  Overrides config file.
-    --config-file Sets up information about the server and database used (see config.tcl.in). Defaults to config.tcl
+    --config-file Sets up information about the server and database used (see install.tcl.in). Defaults to install.tcl
     --no-checkout Do not checkout new source code
     --oacs-only   Do not install .LRN, only OpenACS
     --no-install  Do not install .LRN or OpenACS. Useful if you only want to recreate the db user and then install manually
@@ -164,6 +166,7 @@
 aolserver_group=`get_config_param aolserver_group`
 admin_email=`get_config_param admin_email`
 admin_password=`get_config_param admin_password`
+aolserver_config_file=`get_config_param aolserver_config_file`
 
 # If pre/post checkout scripts have been provided, check that they can
 # be executed
@@ -248,6 +251,13 @@
     chmod +x checkout.sh
     config_file=$config_file dotlrn=$dotlrn ./checkout.sh
 
+    if [ -z "$aolserver_config_file" ]; then
+        # No AOLserver config file specified - we are using the standard etc/config.tcl file.
+        # We need to update it with settings in install.tcl since certain parameters 
+        # (such as serverroot) are duplicated between the two files.
+        ./config-replace.sh $config_file
+    fi 
+
     # The post_checkout script can copy back any files (AOLServer config files,
     # log files etc.) under the new source tree, and apply any patches
     # that should be applied (see README).
Index: openacs-4/etc/install/install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/install/install.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/etc/install/install.tcl	3 Nov 2003 16:19:43 -0000	1.1
+++ openacs-4/etc/install/install.tcl	4 Nov 2003 11:10:29 -0000	1.2
@@ -12,8 +12,12 @@
 # Some people like this to be at /web/${server}, but we recommend the below standard setting.
 set serverroot "/var/lib/aolserver/${server}"
 
+# The port number where the server will serve up pages
+set server_port 8000
+
 # The URL where your server will be accessible. This is used by the installation scripts to complete the installation.
-set server_url "http://localhost:8000"
+# Don't forget to include the port number above
+set server_url "http://localhost:${server_port}"
 
 # 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
@@ -48,7 +52,7 @@
 set pg_db_user "postgres"
 
 # Name of the PostgreSQL database. Will be created.
-set pg_db_name ${server}
+set db_name ${server}
 
 # The host running PostgreSQL
 set pg_host localhost
@@ -66,10 +70,10 @@
 #----------------------------------------------------------------------
 
 # The name of the Oracle user and tablespace. Will get created.
-set oracle_user "${server}"
+set db_name ${server}
 
 # Password for the Oracle user
-set oracle_password "${oracle_user}"
+set oracle_password ${oracle_user}
 
 # The system user account and password. We need this to create the tablespace and user above.
 set system_user "system"
@@ -88,13 +92,19 @@
 #
 #######################################################################
 
+# 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 ""
+
 # 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"
 
 # TCLWebTest home directory
 set tclwebtest_dir "/usr/local/tclwebtest"
 
+# AOLserver's home directory
+set aolserver_home "/usr/local/aolserver"
 
+
 #----------------------------------------------------------------------
 # Settings for starting and stopping the server
 #----------------------------------------------------------------------