diff --git a/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java b/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java index 14257ba9ea9146a7cccd99e03ea5471291b7d6f7..6d9fafeea6e920aa5d8d3bf785b8b15f141c807d 100644 --- a/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java +++ b/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java @@ -52,9 +52,10 @@ public class TomcatLauncher { } public TomcatLauncher(int port, String certificateFile, String keyFile) { - if(Files.exists(Paths.get(System.getProperty("user.dir") + File.separator + "keystore.jks"))) + if(Files.exists(Paths.get(System.getProperty("user.dir") + File.separator + "keystore.jks"))){ log.info("Found a valid trust store, injecting into tomcat!"); tomcat.getService().addConnector(TomcatConnectorFactory.getSSLConnectorWithTrustStore(certificateFile, keyFile, port)); + } else{ connector = TomcatConnectorFactory.getSSLConnectorWithoutTrustStore(certificateFile, keyFile, port); tomcat.getService().addConnector(connector);