This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 4f7d34f Clarify when additional Manager instances may be required
4f7d34f is described below
commit 4f7d34ff0b0e9b3568ec2bfa551917a5d55214a9
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 | 5 +++++
webapps/docs/manager-howto.xml | 17 ++++++++++-------
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d6e28f3..959d6eb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,11 @@
<code>SameSite=strict</code> for all cookies, including session
cookies,
created by the application. (markt)
</add>
+ <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">
diff --git a/webapps/docs/manager-howto.xml b/webapps/docs/manager-howto.xml
index e2b200e..1747ef6 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
