Merge pull request openhab#332 from hakan42/330-inject-port-numbers

Fixes openhab#330: Allow port number injection via environment variables
hubermi · Aug 10, 2015 · 36cbdbe · 36cbdbe
2 parents e7a87f1 + 59c188c
commit 36cbdbe
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 5 deletions.
diff --git a/distribution/openhabhome/start.bat b/distribution/openhabhome/start.bat
@@ -4,10 +4,26 @@
 set ECLIPSEHOME="runtime/server"
 
 :: set ports for HTTP(S) server
+:check_http_port
+IF NOT [%OPENHAB_HTTP_PORT%] == [] GOTO :http_port_set
 set HTTP_PORT=8080
+goto :check_https_port
+
+:http_port_set
+set HTTP_PORT=%OPENHAB_HTTP_PORT%
+goto :check_https_port
+
+:check_https_port
+IF NOT [%OPENHAB_HTTPS_PORT%] == [] GOTO :https_port_set
 set HTTPS_PORT=8443
-
+goto :check_path
+
+:https_port_set
+set HTTPS_PORT=%OPENHAB_HTTPS_PORT%
+goto :check_path
+
 :: get path to equinox jar inside ECLIPSEHOME folder
+:check_path
 for /f "delims= tokens=1" %%c in ('dir /B /S /OD %ECLIPSEHOME%\plugins\org.eclipse.equinox.launcher_*.jar') do set EQUINOXJAR=%%c
 
 IF NOT [%EQUINOXJAR%] == [] GOTO :Launch

diff --git a/distribution/openhabhome/start.sh b/distribution/openhabhome/start.sh
@@ -6,8 +6,19 @@ cd `dirname $0`
 eclipsehome="runtime/server";
 
 # set ports for HTTP(S) server
-HTTP_PORT=8080
-HTTPS_PORT=8443
+if [ ! -z ${OPENHAB_HTTP_PORT} ]
+then
+    HTTP_PORT=${OPENHAB_HTTP_PORT}
+else
+    HTTP_PORT=8080
+fi
+
+if [ ! -z ${OPENHAB_HTTPS_PORT} ]
+then
+    HTTPS_PORT=${OPENHAB_HTTPS_PORT}
+else
+    HTTPS_PORT=8443
+fi
 
 # get path to equinox jar inside $eclipsehome folder
 cp=$(find $eclipsehome -name "org.eclipse.equinox.launcher_*.jar" | sort | tail -1);

diff --git a/distribution/openhabhome/start_debug.bat b/distribution/openhabhome/start_debug.bat
@@ -4,10 +4,26 @@
 set ECLIPSEHOME="runtime/server"
 
 :: set ports for HTTP(S) server
+:check_http_port
+IF NOT [%OPENHAB_HTTP_PORT%] == [] GOTO :http_port_set
 set HTTP_PORT=8080
+goto :check_https_port
+
+:http_port_set
+set HTTP_PORT=%OPENHAB_HTTP_PORT%
+goto :check_https_port
+
+:check_https_port
+IF NOT [%OPENHAB_HTTPS_PORT%] == [] GOTO :https_port_set
 set HTTPS_PORT=8443
+goto :check_path
+
+:https_port_set
+set HTTPS_PORT=%OPENHAB_HTTPS_PORT%
+goto :check_path
 
 :: get path to equinox jar inside ECLIPSEHOME folder
+:check_path
 for /f "delims= tokens=1" %%c in ('dir /B /S /OD %ECLIPSEHOME%\plugins\org.eclipse.equinox.launcher_*.jar') do set EQUINOXJAR=%%c
 
 IF NOT [%EQUINOXJAR%] == [] GOTO :Launch

diff --git a/distribution/openhabhome/start_debug.sh b/distribution/openhabhome/start_debug.sh
@@ -6,8 +6,19 @@ cd `dirname $0`
 eclipsehome="runtime/server";
 
 # set ports for HTTP(S) server
-HTTP_PORT=8080
-HTTPS_PORT=8443
+if [ ! -z ${OPENHAB_HTTP_PORT} ]
+then
+    HTTP_PORT=${OPENHAB_HTTP_PORT}
+else
+    HTTP_PORT=8080
+fi
+
+if [ ! -z ${OPENHAB_HTTPS_PORT} ]
+then
+    HTTPS_PORT=${OPENHAB_HTTPS_PORT}
+else
+    HTTPS_PORT=8443
+fi
 
 # get path to equinox jar inside $eclipsehome folder
 cp=$(find $eclipsehome -name "org.eclipse.equinox.launcher_*.jar" | sort | tail -1);