Use workdir prefix for paths of certs

pinges · Apr 23, 2018 · 832dc92 · 832dc92
1 parent 68029a8
commit 832dc92
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main/java/net/consensys/orion/api/cmd/Orion.java b/src/main/java/net/consensys/orion/api/cmd/Orion.java
@@ -284,8 +284,8 @@ public void run(PrintStream out, PrintStream err, Config config) {
       options.setClientAuth(ClientAuth.REQUIRED);
 
       PemKeyCertOptions pemKeyCertOptions =
-          new PemKeyCertOptions().setKeyPath(config.tlsServerKey().toString()).setCertPath(
-              config.tlsServerCert().toString());
+          new PemKeyCertOptions().setKeyPath(config.workDir().resolve(config.tlsServerKey()).toString()).setCertPath(
+              config.workDir().resolve(config.tlsServerCert()).toString());
       options.setPemKeyCertOptions(pemKeyCertOptions);
 
 
@@ -308,10 +308,13 @@ public void run(PrintStream out, PrintStream err, Config config) {
 
       tmfCreator.ifPresent(tmf -> {
         try {
-          HostFingerprintRepository hostFingerprintRepository = new HostFingerprintRepository(config.tlsKnownClients());
+          HostFingerprintRepository hostFingerprintRepository =
+              new HostFingerprintRepository(config.workDir().resolve(config.tlsKnownClients()));
           options.setTrustOptions(new TrustManagerFactoryWrapper(tmf.apply(hostFingerprintRepository)));
         } catch (IOException e) {
-          throw new OrionStartException("Could not read the contents of " + config.tlsKnownClients(), e);
+          throw new OrionStartException(
+              "Could not read the contents of " + config.workDir().resolve(config.tlsKnownClients()),
+              e);
         }
       });
     }