From 89cd1a458823bbbbb1a5167a953f3d03ef1d2e05 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 28 Jan 2018 20:44:54 +0100 Subject: [PATCH] Fix SSL properties --- .../src/org/argeo/cms/internal/kernel/FirstInit.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/FirstInit.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/FirstInit.java index 7406b67e4..9d7b9bed1 100644 --- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/FirstInit.java +++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/FirstInit.java @@ -56,8 +56,8 @@ class FirstInit { String httpPort = getFrameworkProp("org.osgi.service.http.port"); String httpsPort = getFrameworkProp("org.osgi.service.http.port.secure"); /// TODO make it more generic - String httpHost = getFrameworkProp(JettyConstants.PROPERTY_PREFIX + '.' + JettyConstants.HTTP_HOST); - String httpsHost = getFrameworkProp(JettyConstants.PROPERTY_PREFIX + '.' + JettyConstants.HTTPS_HOST); + String httpHost = getFrameworkProp(JettyConstants.PROPERTY_PREFIX + JettyConstants.HTTP_HOST); + String httpsHost = getFrameworkProp(JettyConstants.PROPERTY_PREFIX + JettyConstants.HTTPS_HOST); final Hashtable props = new Hashtable(); // try { @@ -71,7 +71,7 @@ class FirstInit { props.put(JettyConstants.HTTPS_ENABLED, true); Path keyStorePath = KernelUtils.getOsgiInstancePath(KernelConstants.DEFAULT_KEYSTORE_PATH); String keyStorePassword = getFrameworkProp( - JettyConstants.PROPERTY_PREFIX + '.' + JettyConstants.SSL_PASSWORD); + JettyConstants.PROPERTY_PREFIX + JettyConstants.SSL_PASSWORD); if (keyStorePassword == null) keyStorePassword = "changeit"; if (!Files.exists(keyStorePath)) -- 2.30.2