diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-07 14:06:50 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-07 14:20:03 +0200 |
commit | 98e76700439cd9f548a7007757faafff42c16fd4 (patch) | |
tree | 58eba3e6c95a7ab02005cb497ab6ef1366bd1d61 /config-model/src/main/java/com/yahoo | |
parent | 229ae25176a8daaa751c1b37ab8cadb612746d31 (diff) |
Remove use of 'enable-server-ocsp-stapling' feature flag
Diffstat (limited to 'config-model/src/main/java/com/yahoo')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java index 47dab37cc14..9997b20d205 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainer.java @@ -27,7 +27,6 @@ public final class ApplicationContainer extends Container implements private static final String defaultHostedJVMArgs = "-XX:+SuppressFatalErrorMessage"; private final boolean isHostedVespa; - private final boolean enableServerOcspStapling; public ApplicationContainer(AbstractConfigProducer<?> parent, String name, int index, DeployState deployState) { this(parent, name, false, index, deployState); @@ -36,7 +35,6 @@ public final class ApplicationContainer extends Container implements public ApplicationContainer(AbstractConfigProducer<?> parent, String name, boolean retired, int index, DeployState deployState) { super(parent, name, retired, index, deployState); this.isHostedVespa = deployState.isHosted(); - this.enableServerOcspStapling = deployState.featureFlags().enableServerOcspStapling(); addComponent(new SimpleComponent("com.yahoo.container.jdisc.messagebus.NetworkMultiplexerHolder")); addComponent(new SimpleComponent("com.yahoo.container.jdisc.messagebus.NetworkMultiplexerProvider")); @@ -68,12 +66,10 @@ public final class ApplicationContainer extends Container implements if (hasDocproc()) { b.append(ApplicationContainer.defaultHostedJVMArgs).append(' '); } - if (enableServerOcspStapling) { - b.append("-Djdk.tls.server.enableStatusRequestExtension=true ") - .append("-Djdk.tls.stapling.responseTimeout=2000 ") - .append("-Djdk.tls.stapling.cacheSize=256 ") - .append("-Djdk.tls.stapling.cacheLifetime=3600 "); - } + b.append("-Djdk.tls.server.enableStatusRequestExtension=true ") + .append("-Djdk.tls.stapling.responseTimeout=2000 ") + .append("-Djdk.tls.stapling.cacheSize=256 ") + .append("-Djdk.tls.stapling.cacheLifetime=3600 "); } String jvmArgs = super.getJvmOptions(); if (!jvmArgs.isBlank()) { |