summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorArnstein Ressem <aressem@gmail.com>2022-04-08 21:01:30 +0200
committerGitHub <noreply@github.com>2022-04-08 21:01:30 +0200
commitf752ae285c34841561b94238e915a085c9ebdd00 (patch)
tree02f41fd24bfa479a01301b3777228660dc0f563b /configserver
parentc391dd7876516ec296430723ad4f1969dd988003 (diff)
Revert "Revert "Add recommended java.security options.""
Diffstat (limited to 'configserver')
-rwxr-xr-xconfigserver/src/main/sh/start-configserver13
1 files changed, 7 insertions, 6 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver
index 81382fcea9a..4ed972245ae 100755
--- a/configserver/src/main/sh/start-configserver
+++ b/configserver/src/main/sh/start-configserver
@@ -172,14 +172,15 @@ vespa-run-as-vespa-user vespa-runserver -s configserver -r 30 -p $pidfile -- \
-XX:-OmitStackTraceInFastThrow \
-XX:MaxJavaStackTraceDepth=1000000 \
$jvmargs \
- --add-opens=java.base/java.io=ALL-UNNAMED \
- --add-opens=java.base/java.lang=ALL-UNNAMED \
- --add-opens=java.base/java.net=ALL-UNNAMED \
- --add-opens=java.base/java.nio=ALL-UNNAMED \
- --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED \
- --add-opens=java.base/sun.security.ssl=ALL-UNNAMED \
+ --add-opens=java.base/java.io=ALL-UNNAMED \
+ --add-opens=java.base/java.lang=ALL-UNNAMED \
+ --add-opens=java.base/java.net=ALL-UNNAMED \
+ --add-opens=java.base/java.nio=ALL-UNNAMED \
+ --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED \
+ --add-opens=java.base/sun.security.ssl=ALL-UNNAMED \
-Djava.io.tmpdir=${VESPA_HOME}/tmp \
-Djava.library.path=${VESPA_HOME}/lib64 \
+ -Djava.security.properties=${VESPA_HOME}/conf/vespa/java.security.override \
-Djava.awt.headless=true \
-Dsun.rmi.dgc.client.gcInterval=3600000 \
-Dsun.net.client.defaultConnectTimeout=5000 -Dsun.net.client.defaultReadTimeout=60000 \