Added hub mac setting, removed global hal token setting, removed upnp

strict setting (only from command line)

Working on http pool
This commit is contained in:
Admin
2017-11-14 16:37:45 -06:00
parent 690bdaa748
commit d8d5e8f39a
10 changed files with 109 additions and 86 deletions

View File

@@ -76,6 +76,7 @@ public class BridgeSettings extends BackupHandler {
}
String serverPortOverride = System.getProperty("server.port");
String serverIpOverride = System.getProperty("server.ip");
String upnpStrictOverride = System.getProperty("upnp.strict", "true");
if(configFileProperty != null)
{
log.info("reading from config file: " + configFileProperty);
@@ -213,6 +214,8 @@ public class BridgeSettings extends BackupHandler {
theBridgeSettings.setServerPort(serverPortOverride);
if(serverIpOverride != null)
theBridgeSettings.setWebaddress(serverIpOverride);
if(upnpStrictOverride != null)
theBridgeSettings.setUpnpStrict(Boolean.parseBoolean(upnpStrictOverride));
setupParams(Paths.get(theBridgeSettings.getConfigfile()), ".cfgbk", "habridge.config-");
bridgeSecurity.setSecurityData(theBridgeSettings.getSecurityData());