diff --git a/doc/install.html b/doc/install.html index f30d373cb..b82848960 100644 --- a/doc/install.html +++ b/doc/install.html @@ -186,8 +186,7 @@ Compile and deploy
  • - Set Tomcat JVM parameters and - security limits + Configure Tomcat
  • Start Tomcat @@ -649,8 +648,8 @@

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

    -

    VI. Set Tomcat JVM parameters and security - limits

    +

    VI. Configure Tomcat

    +

    Set JVM parameters

    Vitro copies small sections of your RDF database into memory in order to serve Web requests quickly (the in-memory copy and @@ -675,13 +674,35 @@ If an OutOfMemoryError is encountered during Vitro execution, it can be remedied by increasing the heap parameters and restarting Tomcat.

    +

    Set security limits

    - Security limits: Vitro is a multithreaded web application that may + Vitro is a multithreaded web application that may require more threads than are permitted under your Linux installation's default configuration. Ensure that your installation can support the required number of threads by making the following edits to /etc/security/limits.conf:

                        apache	hard	nproc	400
    tomcat6 hard nproc 1500
    +

    Set URI encoding

    +

    + In order for Solr to correctly search for international characters (>127), + you must configure Tomcat to conform to the URI standard by + accepting percent-encoded UTF-8. +

    +

    + Edit Tomcat's conf/server.xml and add the following attribute to each of the + Connector elements: URIEncoding="UTF-8". +

    +                    <Server ...>
    +                      <Service ...>
    +                        <Connector ... URIEncoding="UTF-8"/>
    +                          ...
    +                        </Connector>
    +                      </Service>
    +                    </Server>
    +            
    +

    +

    +

    VII. Start Tomcat

    Most Tomcat installations can be started by running startup.sh