scottk/wlan-cloud-opensync-controller
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-opensync-controller.git synced 2025-11-18 19:05:09 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Setting external and internal mqtt broker addresses, Allow autoprov off with pre-config/enrolled APs, JUnit tests

Browse Source
This commit is contained in:
Mike Hansen
2020-07-21 17:10:55 -04:00
parent a744b26adf
commit 39c63c32d5
9 changed files with 237 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opensync-gateway-cloud-docker/src/main/docker/app/run.sh
View File

@@ -13,7 +13,8 @@ CLIENT_MQTT_SSL_PROPS+=" -Djavax.net.ssl.trustStorePassword=mypassword"
CLIENT_MQTT_SSL_PROPS+=" -Dtip.wlan.mqttBroker.password=admin"
OVSDB_MANAGER_HOST=${OVSDB_MANAGER}
MQTT_BROKER_HOST="${MQTT_SERVER}"
MQTT_BROKER_HOST_INTERNAL="${MQTT_SERVER_INTERNAL}"
MQTT_BROKER_HOST_EXTERNAL="${MQTT_SERVER_EXTERNAL}"
PROV_SERVER_HOST="${PROV_SERVER}"
SSC_SERVER_HOST="${SSC_SERVER}"
ALL_IN_ONE_HOST="${INTEGRATED_SERVER}"
@@ -28,7 +29,8 @@ OVSDB_PROPS+=" -Dtip.wlan.ovsdb.keyStore=/opt/tip-wlan/certs/server.pkcs12"
OVSDB_PROPS+=" -Dtip.wlan.ovsdb.configFileName=/app/opensync/config_2_ssids.json"
MQTT_PROPS=" "
MQTT_PROPS+=" -Dtip.wlan.mqttBroker.address=$MQTT_BROKER_HOST"
MQTT_PROPS+=" -Dtip.wlan.mqttBroker.address.internal=$MQTT_BROKER_HOST_INTERNAL"
MQTT_PROPS+=" -Dtip.wlan.mqttBroker.address.external=$MQTT_BROKER_HOST_EXTERNAL"
MQTT_PROPS+=" -Dtip.wlan.mqttBroker.listenPort=1883"
LOGBACK_CONFIG_FILE="${LOGBACK_CONFIG_FILE:=/app/opensync/logback.xml}"
@@ -98,4 +100,4 @@ PROV_PROPS+=" -Dtip.wlan.ovsdb.autoProvisionedCustomerId=$AUTO_PROV_CUSTOMER_ID"
export ALL_PROPS="$PROFILES $SSL_PROPS $CLIENT_MQTT_SSL_PROPS $OVSDB_PROPS $MQTT_PROPS $LOGGING_PROPS $RESTAPI_PROPS $SPRING_EXTRA_PROPS $HOST_PROPS $PROV_PROPS"
java $ALL_PROPS -jar app.jar
java $ALL_PROPS -jar app.jar