This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 858a062 Clarify when additional Manager instances may be required
858a062 is described below
commit 858a062001dc853e36b5dbd7ceb14238912d04f8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Sep 23 20:50:38 2020 +0100
Clarify when additional Manager instances may be required
---
webapps/docs/changelog.xml | 9 +++++++++
webapps/docs/manager-howto.xml | 17 ++++++++++-------
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f1c45f7..a9e3ca7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -68,6 +68,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <fix>
+ Update the Manager How-To in the documentation web application to
+ clarify when a user may wish to deploy additional instances of the
+ Maanger web application. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<add>
diff --git a/webapps/docs/manager-howto.xml b/webapps/docs/manager-howto.xml
index 3868232..6b03e00 100644
--- a/webapps/docs/manager-howto.xml
+++ b/webapps/docs/manager-howto.xml
@@ -65,20 +65,23 @@ the following functions:</p>
directory (unless it was deployed from file system).</li>
</ul>
-<p>A default Tomcat installation includes the Manager. To add an instance of
the
-Manager web application <code>Context</code> to a new host install the
-<code>manager.xml</code> context configuration file in the
+<p>A default Tomcat installation includes an instance of the Manager
application
+configured for the default virtual host. If you create additional virtual
hosts,
+you may wish to add an instance of the Manager application to one or more of
+those Hosts. To add an instance of the Manager web application
+<code>Context</code> to a new host install the <code>manager.xml</code> context
+configuration file in the
<code>$CATALINA_BASE/conf/[enginename]/[hostname]</code> folder. Here is an
example:</p>
<source><![CDATA[<Context privileged="true" antiResourceLocking="false"
docBase="${catalina.home}/webapps/manager">
+ <CookieProcessor
className="org.apache.tomcat.util.http.Rfc6265CookieProcessor"
+ sameSiteCookies="strict" />
<Valve className="org.apache.catalina.valves.RemoteAddrValve"
- allow="127\.0\.0\.1" />
+ allow="127\.\d+\.\d+\.\d+|::1|0:0:0:0:0:0:0:1" />
+ <Manager
sessionAttributeValueClassNameFilter="java\.lang\.(?:Boolean|Integer|Long|Number|String)|org\.apache\.catalina\.filters\.CsrfPreventionFilter\$LruCache(?:\$1)?|java\.util\.(?:Linked)?HashMap"/>
</Context>]]></source>
-<p>If you have Tomcat configured to support multiple virtual hosts
-(websites) you would need to configure a Manager for each.</p>
-
<p>There are three ways to use the <strong>Manager</strong> web
application.</p>
<ul>
<li>As an application with a user interface you use in your browser.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
