aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Tokle <mortent@verizonmedia.com>2021-03-25 14:08:00 +0100
committerMorten Tokle <mortent@verizonmedia.com>2021-03-25 14:08:00 +0100
commit642aa18663931217ac800d11664ceb4aadf7c47d (patch)
tree227368ab2753af05b256c1f68880498410a9587f
parent402f3dd5c5e45c219c0aeeec08b51cd0dadf1c23 (diff)
Update start scripts
-rwxr-xr-xconfigserver/src/main/sh/start-configserver1
-rwxr-xr-xcontainer-disc/src/main/sh/vespa-start-container-daemon.sh1
-rwxr-xr-xstandalone-container/src/main/sh/standalone-container.sh1
3 files changed, 3 insertions, 0 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver
index a42f7f35352..efe91a5cea2 100755
--- a/configserver/src/main/sh/start-configserver
+++ b/configserver/src/main/sh/start-configserver
@@ -181,6 +181,7 @@ vespa-run-as-vespa-user vespa-runserver -s configserver -r 30 -p $pidfile -- \
-Dsun.rmi.dgc.client.gcInterval=3600000 \
-Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=60000 \
-Djavax.net.ssl.keyStoreType=JKS \
+ -Djdk.tls.rejectClientInitiatedRenegotiation=true \
-Djdisc.config.file=$cfpfile \
-Djdisc.export.packages= \
-Djdisc.cache.path=$bundlecachedir \
diff --git a/container-disc/src/main/sh/vespa-start-container-daemon.sh b/container-disc/src/main/sh/vespa-start-container-daemon.sh
index 1ed2d5ccf29..7828ef42ab6 100755
--- a/container-disc/src/main/sh/vespa-start-container-daemon.sh
+++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh
@@ -220,6 +220,7 @@ exec $numactlcmd $envcmd java \
-Djava.library.path="${VESPA_HOME}/lib64" \
-Djava.awt.headless=true \
-Djavax.net.ssl.keyStoreType=JKS \
+ -Djdk.tls.rejectClientInitiatedRenegotiation=true \
-Dsun.rmi.dgc.client.gcInterval=3600000 \
-Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=60000 \
-Djdisc.config.file="$cfpfile" \
diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh
index b8025b9629b..57eca46cdd0 100755
--- a/standalone-container/src/main/sh/standalone-container.sh
+++ b/standalone-container/src/main/sh/standalone-container.sh
@@ -174,6 +174,7 @@ StartCommand() {
-Dsun.net.client.defaultConnectTimeout=5000 \
-Dsun.net.client.defaultReadTimeout=60000 \
-Djavax.net.ssl.keyStoreType=JKS \
+ -Djdk.tls.rejectClientInitiatedRenegotiation=true \
-Djdisc.config.file="$cfpfile" \
-Djdisc.export.packages= \
-Djdisc.cache.path="$bundlecachedir" \