diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2023-02-07 13:10:01 +0100 |
|---|---|---|
| committer | Andreas Geissler <andreas-geissler@telekom.de> | 2023-02-14 08:38:51 +0000 |
| commit | 22f3b16043de9d28461a523202018ef82fcb892d (patch) | |
| tree | e47de6460e7d18faf987bd48135045f166f52552 /kubernetes/uui/resources/config/server.xml | |
| parent | 63ec99de7215eb043093dd0e8ec90d8c33aa6590 (diff) | |
[UUI] Make UUI SM compatible
Change the service definitions and deployment to support the nonTLS setup
(AAF removal) using existing templates
Issue-ID: OOM-2998
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: If86aa97e2bc8eef628a02d43407b2f16b1d06783
Diffstat (limited to 'kubernetes/uui/resources/config/server.xml')
| -rw-r--r-- | kubernetes/uui/resources/config/server.xml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/kubernetes/uui/resources/config/server.xml b/kubernetes/uui/resources/config/server.xml index 275fcd8b14..9bb10fee67 100644 --- a/kubernetes/uui/resources/config/server.xml +++ b/kubernetes/uui/resources/config/server.xml @@ -24,7 +24,7 @@ <Listener className="org.apache.catalina.security.SecurityListener" /> --> <!--APR library loader. Documentation at /docs/apr.html --> - <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" /> + <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="{{ (eq "true" (include "common.needTLS" .)) | ternary "on" "off" }}" /> <!-- Prevent memory leaks due to use of particular java/javax APIs--> <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" /> <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" /> @@ -61,11 +61,15 @@ APR (HTTP/AJP) Connector: /docs/apr.html Define a non-SSL/TLS HTTP/1.1 Connector on port 8080 --> + {{ if (include "common.needTLS" .) }} <Connector port="8080" protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="8443" /> <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol" maxThreads="150" SSLEnabled="true" scheme="https" secure="true" clientAuth="false" sslProtocol="TLS" keystoreFile="{{ .Values.certInitializer.credsPath }}/{{ .Values.certInitializer.fqi_namespace }}.p12" keystorePass="${KEYSTORE_PASSWORD}" /> + {{ else }} + <Connector port="8080" protocol="HTTP/1.1" connectionTimeout="20000" /> + {{ end }} <!-- A "Connector" using the shared thread pool--> <!-- @@ -111,7 +115,11 @@ --> <!-- Define an AJP 1.3 Connector on port 8009 --> + {{ if (include "common.needTLS" .) }} <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> + {{ else }} + <Connector port="8009" protocol="AJP/1.3" secretRequired="false" /> + {{ end }} <!-- An Engine represents the entry point (within Catalina) that processes |