summaryrefslogtreecommitdiffstats
path: root/container-disc/src
diff options
context:
space:
mode:
authorMorten Tokle <mortent@oath.com>2018-02-19 09:18:34 +0100
committerMorten Tokle <mortent@oath.com>2018-02-19 09:18:34 +0100
commit35b4afd93347b1573dcf4a442e9f8a6674fcaa53 (patch)
treeac1afb52caa0698cbccb50fcb1eb3240a58877e5 /container-disc/src
parent9626077ed7ff8f6f6b048b55eeeb3a3999452f01 (diff)
relative path to truststore
Diffstat (limited to 'container-disc/src')
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImpl.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImpl.java b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImpl.java
index c32d08c97ff..3b2b065fa8c 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImpl.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/athenz/impl/AthenzIdentityProviderImpl.java
@@ -8,6 +8,7 @@ import com.yahoo.container.jdisc.athenz.AthenzIdentityProvider;
import com.yahoo.container.jdisc.athenz.AthenzIdentityProviderException;
import com.yahoo.jdisc.Metric;
import com.yahoo.log.LogLevel;
+import com.yahoo.vespa.defaults.Defaults;
import javax.net.ssl.KeyManager;
import javax.net.ssl.KeyManagerFactory;
@@ -164,7 +165,7 @@ public final class AthenzIdentityProviderImpl extends AbstractComponent implemen
private static TrustManager[] createTrustManagersWithAthenzCa() {
try {
KeyStore trustStore = KeyStore.getInstance("JKS");
- try (FileInputStream in = new FileInputStream("/opt/yahoo/share/ssl/certs/yahoo_certificate_bundle.jks")) {
+ try (FileInputStream in = new FileInputStream(Defaults.getDefaults().underVespaHome("share/ssl/certs/yahoo_certificate_bundle.jks"))) {
trustStore.load(in, null);
}
TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());