Skip to content

Commit

Permalink
Merge pull request #234 from rhusar/jdk17
Browse files Browse the repository at this point in the history
Add JDK information to the support matrix + Fix xref: links to developer guide
  • Loading branch information
rhusar authored Dec 17, 2024
2 parents 25cfd2f + a640cbc commit df91e09
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 12 deletions.
1 change: 1 addition & 0 deletions docs/src/main/asciidoc/developer/design.adoc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[[mod_cluster-design]]
= ModClusterDesign

NOTE: {editurl}design.adoc[{editnote}]
Expand Down
3 changes: 2 additions & 1 deletion docs/src/main/asciidoc/developer/encrypting_connection.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
= Encrypting connection between httpd and TC
[[encrypting-connection-tomcat]]
= Encrypting connection between httpd and Tomcat

NOTE: {editurl}encrypting_connection.adoc[{editnote}]

Expand Down
3 changes: 2 additions & 1 deletion docs/src/main/asciidoc/developer/mod_proxy_forwarding.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
= Forwarding SSL environment when using http/https proxy:
[[modproxy-forwarding]]
= Forwarding SSL environment when using http/https proxy

NOTE: {editurl}mod_proxy_forwarding.adoc[{editnote}]

Expand Down
10 changes: 5 additions & 5 deletions docs/src/main/asciidoc/introduction.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ the former name mod_cluster is currently used for container implementation.
=== Container Integration Modules

|===
| Release | Tomcat versions | Code | Documentation
|Release |Tomcat versions |Java SE |Code |Documentation

| `2.1` (in development) | `11.0`, `10.1`, `9.0` | https://github.com/modcluster/mod_cluster/tree/main[SCM Branch] | https://docs.modcluster.io/apidocs/2.1/[Javadoc]
| `2.0` | `10.1`, `9.0`, `8.5` (EOL) | https://github.com/modcluster/mod_cluster/tree/2.0.x[SCM Branch] | https://docs.modcluster.io/apidocs/2.0/[Javadoc]
| `1.4` | `9.0`, `8.5` (EOL), `8.0` (EOL), `7.0` (EOL) | https://github.com/modcluster/mod_cluster/tree/1.4.x[SCM Branch] | https://docs.modcluster.io/apidocs/1.4/[Javadoc]
|`2.1` |`11.0`, `10.1`, `9.0` |17 |https://github.com/modcluster/mod_cluster/tree/main[SCM Branch] |https://docs.modcluster.io/apidocs/2.1/[Javadoc]
|`2.0` |`10.1`, `9.0`, `8.5` (EOL) |11 |https://github.com/modcluster/mod_cluster/tree/2.0.x[SCM Branch] |https://docs.modcluster.io/apidocs/2.0/[Javadoc]
|`1.4` |`9.0`, `8.5` (EOL), `8.0` (EOL), `7.0` (EOL) |8 |https://github.com/modcluster/mod_cluster/tree/1.4.x[SCM Branch] |https://docs.modcluster.io/apidocs/1.4/[Javadoc]
|===

=== Apache HTTP modules
Expand Down Expand Up @@ -90,7 +90,7 @@ that server.
* AJP is optional

Unlike mod_jk, mod_proxy_cluster does not require AJP. httpd connections to application server nodes can use HTTP, HTTPS, or AJP.
The original concepts are described in a xref:developer/design.adoc[Design] article.
The original concepts are described in a xref:developer/index.adoc#mod_cluster-design[Design] article.

== Requirements

Expand Down
8 changes: 3 additions & 5 deletions docs/src/main/asciidoc/security.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ stored in the sslKeyStore of the ClusterListener parameters.

==== ClusterListener configuration part

There is a xref:developer/cluster_listener.adoc[ModCluster Listener] article
There is a xref:developer/index.adoc#ClusterListener[ModCluster Listener] article
describing the SSL parameters of the ClusterListener. See in one example
how easy the configuration is:

Expand Down Expand Up @@ -215,8 +215,7 @@ Using https allows to encrypt communications between httpd and JBossWEB.
But due to the resources it needs that no advised to use it in high
load configuration.

(See xref:developer/encrypting_connection.adoc[Encrypting connection between httpd
and TC] for detailed instructions).
See xref:developer/index.adoc#encrypting-connection-tomcat[Encrypting connection between httpd and TC] for detailed instructions.

httpd is configured to be a client for AS/TC, so it should provide a
certificate AS/TC will accept and have a private key to encrypt the
Expand Down Expand Up @@ -313,8 +312,7 @@ SSLValve and export the SSL variable as header in the request in httpd.
If you are using AJP, mod_proxy_ajp will read the SSL variables and
forward them to JBossWEB automatically.

(See xref:developer/mod_proxy_forwarding.adoc[Forwarding SSL environment when using
http/https proxy] for detailed instructions).
See xref:developer/index.adoc#modproxy-forwarding[Forwarding SSL environment when using http/https proxy] for detailed instructions.

The SSL variable used by mod_proxy_ajp are the following:

Expand Down

0 comments on commit df91e09

Please sign in to comment.