diff options
author | Morten Tokle <mortent@yahooinc.com> | 2023-06-19 11:10:20 +0200 |
---|---|---|
committer | Morten Tokle <mortent@yahooinc.com> | 2023-06-20 09:07:54 +0200 |
commit | d7b3239e3acbd42ab7733fe868407786a93cea3f (patch) | |
tree | d5eedbadb050bdb73fa6fba8e0030f4bc0e42d33 /container-core | |
parent | 2dbee348336346b42e7cacc22d80ce24e1730c23 (diff) |
Handle proxy start/reload issues
Diffstat (limited to 'container-core')
-rw-r--r-- | container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/DataplaneProxyCredentials.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/DataplaneProxyCredentials.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/DataplaneProxyCredentials.java index a30252b1626..05c6f5be467 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/DataplaneProxyCredentials.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/DataplaneProxyCredentials.java @@ -37,8 +37,16 @@ public class DataplaneProxyCredentials extends AbstractComponent { @Inject public DataplaneProxyCredentials() { - certificateFile = Paths.get(Defaults.getDefaults().underVespaHome("tmp/proxy_cert.pem")); - keyFile = Paths.get(Defaults.getDefaults().underVespaHome("tmp/proxy_key.pem")); + this( + Paths.get(Defaults.getDefaults().underVespaHome("tmp/proxy_cert.pem")), + Paths.get(Defaults.getDefaults().underVespaHome("tmp/proxy_key.pem")) + ); + } + + public DataplaneProxyCredentials(Path certificateFile, Path keyFile){ + this.certificateFile = certificateFile; + this.keyFile = keyFile; + var existing = regenerateCredentials(certificateFile, keyFile).orElse(null); if (existing == null) { X509CertificateWithKey selfSigned = X509CertificateUtils.createSelfSigned("cn=vespa dataplane proxy", Duration.ofDays(30)); @@ -48,6 +56,7 @@ public class DataplaneProxyCredentials extends AbstractComponent { } else { this.certificate = existing; } + } /** |