Index: openacs-4/packages/acs-bootstrap-installer/installer/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/index.tcl,v diff -u -r1.28 -r1.29 --- openacs-4/packages/acs-bootstrap-installer/installer/index.tcl 30 Mar 2013 21:30:16 -0000 1.28 +++ openacs-4/packages/acs-bootstrap-installer/installer/index.tcl 27 Oct 2014 16:39:04 -0000 1.29 @@ -41,10 +41,9 @@ and the OpenACS username, recreate them, and try again. You can log this as a bug using the OpenACS Bug Tracker. " - return + return } return - } set body " @@ -125,44 +124,24 @@ if { [catch { ns_sha1 quixotusishardcore }] } { append errors "
  • The ns_sha1 function is missing. This function is required in OpenACS 4.x so that passwords can be securely stored in - the database. This function is available in the nssha1 module that is part of the ArsDigita server - distribution.

    " + the database.

    " set error_p 1 } # OpenNSD must support Tcl 8.x -if { [string range [info tclversion] 0 0] < 8 } { - append errors "
  • You are using a version of Tcl less than 8.0. You must use Tcl version 8.0 - for OpenACS to work. Probably your nsd executable is linked to nsd76. Please - link it to nsd8x to fix this problem. Please refer to the - Installation Guide. -

    -    ln -s /home/aol30/bin/nsd8x /home/aol30/nsd
    -    
    +if { [info tclversion] < 8.5 } { + append errors "
  • You are using a version of Tcl less than 8.5. You must use Tcl version 8.5 + or newer for OpenACS to work. Probably your nsd executable is linked to an older version of Tcl. " set error_p 1 } # AOLserver must support ns_cache. if {[llength [info commands ns_cache]] < 1} { - append errors "

  • The ns_cache module is not installed. This -is required to support the OpenACS Security system. Please make sure that ns_cache -is included in your module list. An example module list is shown below: -file (usually in /home/aol30/yourservername.ini) or see the -Installation Guide for more information.

    -

    -\[ns/server/bquinn/modules\] 
    -nssock=nssock.so 
    -nslog=nslog.so 
    -nssha1=nssha1.so
    -nscache=nscache.so
    -
    -After adding ns_cache, please restart your web server. -

    " + append errors "
  • The ns_cache module is not installed. This is required for OpenACS." set error_p 1 -} +} # AOLserver must have XML parsing. if {![xml_support_ok xml_status_msg]} { @@ -211,31 +190,31 @@ # APM needs to check its permissions. if { [catch {apm_workspace_dir} ] } { - append errors "

  • The [acs_root_dir] directory has incorrect permissions. It must be owned by + append errors "

  • The $::acs::rootdir directory has incorrect permissions. It must be owned by the user executing the web server, normally nsadmin, and the owner must have read and write privileges on this directory. You can correct this by running the following script as root. To give another user access to the files, add them to web group.

     groupadd web
    -chown -R nsadmin:web [acs_root_dir]
    -chmod -R ug+rw [acs_root_dir]
    +chown -R nsadmin:web $::acs::rootdir
    +chmod -R ug+rw $::acs::rootdir
     

    " set error_p 1 } # We have the workspace dir, but what about the package root? -if { ![file writable [file join [acs_root_dir] packages]] } { - append errors "
  • The [acs_root_dir]/packages directory has incorrect permissions. It must be owned by +if { ![file writable [file join $::acs::rootdir packages]] } { + append errors "

  • The $::acs::rootdir/packages directory has incorrect permissions. It must be owned by the user executing the web server, normally nsadmin and the owner must have read and write privileges on this directory and all of its subdirectories. You can correct this by running the following script as root. To give another user access to the files, add them to web group. -

    +    
     groupadd web
    -chown -R nsadmin:web [acs_root_dir]/packages
    -chmod -R ug+rw [acs_root_dir]/packages
    -

    " +chown -R nsadmin:web $::acs::rootdir/packages +chmod -R ug+rw $::acs::rootdir/packages +

    " set error_p 1 } @@ -244,18 +223,18 @@ # Now that we know that the database and aolserver are set up # correctly, let's check out the actual db. if {$error_p} { - append body "

    -At least one misconfiguration was discovered that must be corrected. -Please fix all of them, restart the web server, and try running the OpenACS installer again. -You can proceed without resolving these errors, but the system may not function -correctly. - -

    -

    -

    -" + append body [subst {

    + At least one misconfiguration was discovered that must be corrected. + Please fix all of them, restart the web server, and try running the OpenACS installer again. + You can proceed without resolving these errors, but the system may not function + correctly. + +

    +

    +

    + }] } # See whether the data model appears to be installed or not. The very first @@ -266,8 +245,9 @@ # Get the default for system_url. First try to get it from the nssock # hostname setting - if that is not available then try ns_info if { [catch { - set system_url "http://[ns_config "ns/server/[ns_info server]/module/nssock" hostname [ns_info hostname]]" - set system_port [ns_config "ns/server/[ns_info server]/module/nssock" port [ns_conn port]] + set driversection [ns_driversection] + set system_url "http://[ns_config $driversection hostname [ns_info hostname]]" + set system_port [ns_config $driversection port [ns_conn port]] # append port number if non-standard port if { !($system_port == 0 || $system_port == 80) } {