diff --git a/doc/install.html b/doc/install.html index 6121d15a6..0c7f61a74 100644 --- a/doc/install.html +++ b/doc/install.html @@ -205,7 +205,7 @@ using "Contact Us" form)
  • - Setup Apache Tomcat Connector + Set up Apache HTTPD
  • Using an External Authentication @@ -770,7 +770,7 @@ At the command line, change to the webapp directory inside the Vitro distribution directory. Then type:

    -
                    ant all
    +
        ant all

    to build Vitro and deploy to Tomcat's webapps directory.

    @@ -785,7 +785,7 @@
    For example:

    -
                        export CATALINA_OPTS="-Xms512m -Xmx512m -XX:MaxPermSize=128m"
    +
        export CATALINA_OPTS="-Xms512m -Xmx512m -XX:MaxPermSize=128m"

    This sets Tomcat to allocate an initial heap of 512 megabytes, a maximum heap of 512 megabytes, and a PermGen space of 128 megs. Lower @@ -837,7 +837,7 @@ deployment parameters from the overridden context fragment.

    - See Section XI below, + See Section XI below, for an example of overriding the Vitro context fragment.

    @@ -921,43 +921,22 @@ provide an email address in this step, your users will receive a java error in the interface.

    -

    XI. Set up Apache Tomcat Connector

    +

    XI. Set up Apache HTTPD

    - It is recommended that a Tomcat Connector such as mod_jk be used to - ensure that the site address does not include the port number (e.g. - 8080) and an additional reference to the Tomcat context name (e.g. - /vitro). + It is recommended to run an Apache HTTPD web server to accept requests + and then proxy them to the VIVO Tomcat context. This will make Vitro + available at "http://example.com" instead of "http://example.com:8080/vitro". + It will also allow the use of external authentication.

    - This will make Vitro available at "http://example.com" instead of - "http://example.com:8080/vitro" + Setup HTTPD to send all of the requests that it receives to Tomcat's AJP + connector. This can be done in HTTPD 2.x with a simple directive in httpd.conf:

    +
         ProxyPass / ajp://localhost:8009/ 

    - Using the mod_jk connector allows for communication between Tomcat - and the primary web server. The Quick - Start HowTo - on the Apache site describes the minimum server - configurations for several popular web servers. -

    -

    - After setting up the mod_jk connector above, you will need to - modify the Tomcat's server.xml (located in [tomcat root]/conf/) - to - respond - to - requests from Apache via the connector. Look for the - <connector> directive and add the following properties: -

    -
                    connectionTimeout="20000" maxThreads="320" keepAliveTimeout="20000"  
    -

    - Note: the value for maxThreads (320) is equal to the value for - MaxClients in the apache's httpd.conf - file. -

    -

    - Locate the <Host name="localhost"...> - directive - and update as follows: + Modify the <Host> in Tomcat server.xml (located in [tomcat root]/conf/) + so that the context path is empty to allow VIVO to be servred from the root path. + Locate the <Host name="localhost"...> directive and update as follows:

                  <Host name="localhost" appBase="webapps"
                            DeployOnStartup="false"
    @@ -976,6 +955,17 @@
                       
                        ...
                 
    +

    + After setting up the above, it is recommended that you modify the Tomcat AJP connector + parameters in server.xml. Look for the <connector> directive and add the + following properties: +

    +
        connectionTimeout="20000" maxThreads="320" keepAliveTimeout="20000" 

    +

    + Note: the value for maxThreads (320) is equal or greater than the value for + MaxClients in the apache's httpd.conf file. +

    +

    XII. Using an External Authentication System with Vitro