From 57ca70861cb55cefa96e924b01625676a67d87f2 Mon Sep 17 00:00:00 2001 From: lolodomo Date: Wed, 31 Jul 2024 10:16:07 +0200 Subject: [PATCH] [freeboxos] Change default HTTPS port (#17086) Set default to 443 as it is the default HTTPS port to use to connect to mafreebox.freebox.fr. Fix #17075 Signed-off-by: Laurent Garnier --- bundles/org.openhab.binding.freeboxos/README.md | 4 ++-- .../freeboxos/internal/config/FreeboxOsConfiguration.java | 2 +- .../src/main/resources/OH-INF/config/bridge-config.xml | 6 +++--- .../src/main/resources/OH-INF/i18n/freeboxos.properties | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bundles/org.openhab.binding.freeboxos/README.md b/bundles/org.openhab.binding.freeboxos/README.md index 21c246b580c..3e11aab99ca 100644 --- a/bundles/org.openhab.binding.freeboxos/README.md +++ b/bundles/org.openhab.binding.freeboxos/README.md @@ -60,8 +60,8 @@ FreeboxOS binding has the following configuration parameters: | Application Token | appToken | Token generated by the Freebox Server. | Yes | | | Network Device Discovery | discoverNetDevice | Enable the discovery of network device things. | No | false | | Background Discovery Interval | discoveryInterval | Interval in minutes - 0 disables background discovery | No | 10 | -| HTTPS Available | httpsAvailable | Tells if https has been configured on the Freebox | No | false | -| HTTPS port | httpsPort | Port to use for remote https access to the Freebox Api | No | 15682 | +| HTTPS Available | httpsAvailable | Tells if HTTPS has been configured on the Freebox | No | false | +| HTTPS port | httpsPort | Port to use for HTTPS access to the Freebox Api | No | 443 | | Websocket Reconnect Interval | wsReconnectInterval | Disconnection interval, in minutes- 0 disables websocket usage | No | 60 | If the parameter *apiDomain* is not set, the binding will use the default address used by Free to access your Freebox Server (mafreebox.freebox.fr). diff --git a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/config/FreeboxOsConfiguration.java b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/config/FreeboxOsConfiguration.java index 32d3698da74..664936b956d 100644 --- a/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/config/FreeboxOsConfiguration.java +++ b/bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/config/FreeboxOsConfiguration.java @@ -36,7 +36,7 @@ public class FreeboxOsConfiguration { public int discoveryInterval = 10; public int wsReconnectInterval = 60; - private int httpsPort = 15682; + private int httpsPort = 443; private boolean httpsAvailable; private String getScheme() { diff --git a/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/config/bridge-config.xml b/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/config/bridge-config.xml index 19ead6a7654..f0db723ae4a 100644 --- a/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/config/bridge-config.xml +++ b/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/config/bridge-config.xml @@ -32,15 +32,15 @@ - Tells if https has been configured on the Freebox + Tells if HTTPS has been configured on the Freebox true false - Port to use for remote https access to the Freebox Api + Port to use for HTTPS access to the Freebox Api true - 15682 + 443 diff --git a/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/i18n/freeboxos.properties b/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/i18n/freeboxos.properties index e6c76e61881..16008685fa6 100644 --- a/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/i18n/freeboxos.properties +++ b/bundles/org.openhab.binding.freeboxos/src/main/resources/OH-INF/i18n/freeboxos.properties @@ -70,9 +70,9 @@ bridge-type.config.freeboxos.api.discoverNetDevice.description = Enable the disc bridge-type.config.freeboxos.api.discoveryInterval.label = Background Discovery Interval bridge-type.config.freeboxos.api.discoveryInterval.description = Background discovery interval in minutes (default 10 - 0 disables background discovery) bridge-type.config.freeboxos.api.httpsAvailable.label = HTTPS Available -bridge-type.config.freeboxos.api.httpsAvailable.description = Tells if https has been configured on the Freebox +bridge-type.config.freeboxos.api.httpsAvailable.description = Tells if HTTPS has been configured on the Freebox bridge-type.config.freeboxos.api.httpsPort.label = HTTPS port -bridge-type.config.freeboxos.api.httpsPort.description = Port to use for remote https access to the Freebox Api +bridge-type.config.freeboxos.api.httpsPort.description = Port to use for HTTPS access to the Freebox Api bridge-type.config.freeboxos.api.wsReconnectInterval.label = Websocket Reconnect Interval bridge-type.config.freeboxos.api.wsReconnectInterval.description = Disconnection interval, in minutes- 0 disables websocket usage thing-type.config.freeboxos.call.refreshInterval.label = State Refresh Interval