diff options
| author | Morten Tokle <mortent@oath.com> | 2018-02-20 00:26:42 +0100 |
|---|---|---|
| committer | Morten Tokle <mortent@oath.com> | 2018-02-20 00:26:42 +0100 |
| commit | c3f1805819a05096024e40adefb2eab2e7cb857a (patch) | |
| tree | 2affd2fc896eefa0fe3da830710b68471248b608 /athenz-identity-provider-service | |
| parent | d94b9fe55e3ec6aef06972ade555b69ea2b4c189 (diff) | |
| parent | f5392f2996bef6e2c637d53d58f5867c4c0339f8 (diff) | |
Merge branch 'master' into mortent/ckms
Diffstat (limited to 'athenz-identity-provider-service')
| -rw-r--r-- | athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/identityprovider/AthenzIdentityProviderImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/identityprovider/AthenzIdentityProviderImpl.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/identityprovider/AthenzIdentityProviderImpl.java index 6e09bb3bd32..18f90ce545f 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/identityprovider/AthenzIdentityProviderImpl.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/identityprovider/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 com.yahoo.vespa.athenz.api.AthenzIdentityCertificate; import com.yahoo.vespa.athenz.tls.AthenzSslContextBuilder; @@ -115,7 +116,7 @@ public final class AthenzIdentityProviderImpl extends AbstractComponent implemen .withIdentityCertificate(new AthenzIdentityCertificate( credentials.getCertificate(), credentials.getKeyPair().getPrivate())) - .withTrustStore(new File("/opt/yahoo/share/ssl/certs/yahoo_certificate_bundle.jks"), "JKS") + .withTrustStore(new File(Defaults.getDefaults().underVespaHome("share/ssl/certs/yahoo_certificate_bundle.jks")), "JKS") .build(); } |