Expose the PIPELINE2_HOST as an env variable

so that it can be set at run time for example when starting a Docker image and remove it from the system.properties (otherwise setting it as an option when starting the JVM seems to have no effect)
daisy · Oct 9, 2017 · f23c1d6 · f23c1d6
1 parent 387ca2c
commit f23c1d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/resources/bin/pipeline2 b/src/main/resources/bin/pipeline2
@@ -370,6 +370,9 @@ run() {
     if [ "x$PIPELINE2_AUTH_CLIENTSECRET" != "x" ]; then
         OPTS="$OPTS -Dorg.daisy.pipeline.ws.authentication.secret=$PIPELINE2_AUTH_CLIENTSECRET"
     fi
+    if [ "x$PIPELINE2_HOST" != "x" ]; then
+        OPTS="$OPTS -Dorg.daisy.pipeline.ws.host=$PIPELINE2_HOST"
+    fi
     MAIN=org.apache.felix.main.Main
     MODE=" -Dorg.daisy.pipeline.main.mode=webservice"
 

diff --git a/src/main/resources/etc/system.properties b/src/main/resources/etc/system.properties
@@ -15,7 +15,7 @@ org.daisy.pipeline.xproc.configuration=${org.daisy.pipeline.home}/etc/config-cal
 java.awt.headless=true
 
 #WS configuration
-org.daisy.pipeline.ws.host=localhost
+#org.daisy.pipeline.ws.host=localhost
 #allow local filesystem interaction
 #org.daisy.pipeline.ws.localfs=true
 #org.daisy.pipeline.ws.authentication=false