# HG changeset patch # User Severin Gehwolf # Date 1500396380 -7200 # Node ID c69fd8f97d50292549e796ed1e27c32bfbcf86c6 # Parent 8c2659d0cadf57bc154ad0299644d6e036e9f418 Copy ssl example config prior starting agent. Reviewed-by: ebaron Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-July/024130.html diff -r 8c2659d0cadf -r c69fd8f97d50 thermostat-ng.sh --- a/thermostat-ng.sh Tue Jul 18 16:03:37 2017 +0200 +++ b/thermostat-ng.sh Tue Jul 18 18:46:20 2017 +0200 @@ -184,7 +184,7 @@ npm_build() { # setup environment variables export NODE_ENV=development - export GATEWAY_URL=http://127.0.0.1:30000 + export GATEWAY_URL npm install npm run build } @@ -201,6 +201,7 @@ fi echo "username=foo-agent-user" >> $agent_conf echo "password=agent-pwd" >> $agent_conf + cp $AGENT_ROOT/distribution/target/image/etc/examples/ssl.properties.example $AGENT_ROOT/distribution/target/image/etc/ssl.properties } @@ -239,7 +240,7 @@ # Idle loop so as to be able to receive signals idle() { echo "Thermostat started. Stop with CTRL+C" - echo "The web client can be accessed at: http://127.0.0.1:30000/web-client/" + echo "The web client can be accessed at: $GATEWAY_URL/web-client/" echo "Use credentials 'test-user':'test-pass' to log in." while true; do sleep 60 @@ -250,6 +251,7 @@ WEB_GATEWAY_ROOT="${TOP_DIR}/web-gateway" AGENT_ROOT="${TOP_DIR}/agent" WEB_CLIENT_ROOT="${TOP_DIR}/web-client" +GATEWAY_URL="https://127.0.0.1:30000" DO_BUILD=${BUILD:-true} RUN_DATA_DIR="$TOP_DIR/data"