The installer will automatically install the $acs_application(pretty_name) application after the basic OpenACS tookit has been installed. @@ -83,6 +83,11 @@ $acs_application(pretty_name) home page " } +} else { + set acs_application(name) openacs + set acs_application(pretty_name) OpenACS + set acs_application(home) "" + set acs_application(min_stack_size) 128 } set error_p 0 @@ -183,22 +188,20 @@ set error_p 1 } -# AOLserver must have a large stack size (at least 128K) +# AOLserver must have a large stack size (at least 128K by default, or the value specified +# in the install.xml file) + set stacksize [ns_config "ns/threads" StackSize] -if { $stacksize < [expr 128 * 1024] } { +if { $stacksize < [expr $acs_application(min_stack_size) * 1024] } { - append errors "
The configured AOLserver Stacksize is too small ($stacksize). -OpenACS requires a StackSize parameter of at least 131072 (ie 128K). -Please add the following to your AOLserver configuration file or -see the Installation Guide for more information.
+ append errors "
The configured AOLserver Stacksize is too small +([expr $stacksize / 1024]K). +$acs_application(pretty_name) requires a StackSize parameter of at least +${acs_application(min_stack_size)}K. +
Please add the following line to your .tcl configuration file
--\[ns/threads\] -stacksize=131072 -
If you use a .tcl configuration file, add -
ns_section \"ns/threads\"
- ns_param StackSize [expr 128*1024]
+ ns_param StackSize \[expr ${acs_application(min_stack_size)}*1024\]
The OpenACS data model is already installed. Click Next to scan the available packages. - + [install_next_button "packages-install"] " } 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]