diff options
| author | Morten Tokle <mortent@verizonmedia.com> | 2019-09-13 07:59:21 +0200 |
|---|---|---|
| committer | Morten Tokle <mortent@verizonmedia.com> | 2019-09-16 12:45:28 +0200 |
| commit | b786d92bf670c17718460825ad371eff25116041 (patch) | |
| tree | 55eba292de860c5cde7509c9b40a2598a7880bc4 /controller-server/src | |
| parent | fbec690f200794c7fe0a2eedf1e2a03ff35ee0aa (diff) | |
Add truststore to testerapp 4443 port
Diffstat (limited to 'controller-server/src')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java | 1 | ||||
| -rw-r--r-- | controller-server/src/test/resources/test_runner_services.xml-cd | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index 679af1a5a8c..26fad1bd422 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -733,6 +733,7 @@ public class InternalStepRunner implements StepRunner { " <ssl>\n" + " <private-key-file>/var/lib/sia/keys/" + idDomain.value() + ".tenant.key.pem</private-key-file>\n" + " <certificate-file>/var/lib/sia/certs/" + idDomain.value() + ".tenant.cert.pem</certificate-file>\n" + + " <ca-certificates-file>/opt/yahoo/share/ssl/certs/athenz_certificate_bundle.pem</ca-certificates-file>\n" + " <client-authentication>want</client-authentication>\n" + " </ssl>\n" + " </server>\n" + diff --git a/controller-server/src/test/resources/test_runner_services.xml-cd b/controller-server/src/test/resources/test_runner_services.xml-cd index 53461a1098e..3b1554c6604 100644 --- a/controller-server/src/test/resources/test_runner_services.xml-cd +++ b/controller-server/src/test/resources/test_runner_services.xml-cd @@ -31,6 +31,7 @@ <ssl> <private-key-file>/var/lib/sia/keys/vespa.vespa.tenant.key.pem</private-key-file> <certificate-file>/var/lib/sia/certs/vespa.vespa.tenant.cert.pem</certificate-file> + <ca-certificates-file>/opt/yahoo/share/ssl/certs/athenz_certificate_bundle.pem</ca-certificates-file> <client-authentication>want</client-authentication> </ssl> </server> |