From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 24 Aug 2016 15:44:05 +0000 (+0000)
Subject: Make http host configurable.
X-Git-Tag: argeo-commons-2.1.45~27
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=6f9335c20dfa92daa86d5a8ac6391365990f0462;p=lgpl%2Fargeo-commons.git

Make http host configurable.

git-svn-id: https://svn.argeo.org/commons/trunk@9086 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java
index 64a9d170b..eb57b1b19 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/CmsState.java
@@ -285,6 +285,8 @@ public class CmsState implements NodeState, ManagedService {
 	private void initWebServer() {
 		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("org.eclipse.equinox.http.jetty.http.host");
 		try {
 			if (httpPort != null || httpsPort != null) {
 				final Hashtable<String, Object> jettyProps = new Hashtable<String, Object>();
@@ -301,6 +303,9 @@ public class CmsState implements NodeState, ManagedService {
 					jettyProps.put(JettyConstants.SSL_PASSWORD, "changeit");
 					jettyProps.put(JettyConstants.SSL_WANTCLIENTAUTH, true);
 				}
+				if(httpHost!=null){
+					jettyProps.put(JettyConstants.HTTP_HOST, httpHost);
+				}
 				if (configurationAdmin != null) {
 					// TODO make filter more generic
 					String filter = "(" + JettyConstants.HTTP_PORT + "=" + httpPort + ")";