Index: openacs-4/packages/acs-bootstrap-installer/installer/install.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/install.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-bootstrap-installer/installer/install.tcl 31 Oct 2003 11:07:42 -0000 1.6 +++ openacs-4/packages/acs-bootstrap-installer/installer/install.tcl 11 Dec 2003 18:02:26 -0000 1.7 @@ -1,27 +1,11 @@ -ad_page_contract { - Carries out the full OpenACS install. +############## +# +# Get configuration parameters +# +############# - @author Peter Marklund - @cvs-id $Id$ +install_page_contract [install_mandatory_params] [install_optional_params] -} { - email:notnull - {username ""} - first_names:notnull - last_name:notnull - password:notnull - password_confirmation:notnull - - system_url:notnull - system_name:notnull - publisher_name:notnull - {system_owner ""} - {admin_owner ""} - {host_administrator ""} - {outgoing_sender ""} - {new_registrations ""} -} - # Default all system emails to the administrators email foreach var_name {system_owner admin_owner host_administrator outgoing_sender new_registrations} { if { [empty_string_p [set $var_name]] } { @@ -177,13 +161,22 @@ # We're done - kill the server (will restart if server is setup properly) ad_schedule_proc -thread t -once t 1 ns_shutdown +set post_installation_message \ + [parameter::get_from_package_key -package_key acs-bootstrap-installer \ + -parameter post_installation_message \ + -default ""] + ns_write "Installation finished

The server has been shut down. Normally, it should come back up by itself after a minute or so.

-

If not, please check your server error log, or contact your system administrator.

+

If not, please check your server error log, or contact your system administrator.

" -

When the server is back up you can visit the site-wide administration pages

+if { ![string equal $post_installation_message ""] } { + ns_write $post_installation_message +} else { + ns_write " +

When the server is back up you can visit the site-wide administration pages

" +} -[install_footer] -" +ns_write [install_footer]