[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 <lg.hc@free.fr>

diff --git a/bundles/org.openhab.binding.freeboxos/README.md b/bundles/org.openhab.binding.freeboxos/README.md
index 21c246b580c0ec016ae3b365cee43458dd8db46b..3e11aab99ca5bc9290462b7fbb730ee5e2b7cd59 100644 (file)
--- 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 32d3698da74d9f7824eb767b148eac3d8c9a5e0b..664936b956d0c31d3a834aaf7ef9395a78af67d9 100644 (file)
--- 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 19ead6a765476016e6eba3c780208efabf24983e..f0db723ae4a206fd8fb8ccb3ce64f2ba73b65663 100644 (file)
--- 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 @@
                </parameter>
                <parameter name="httpsAvailable" type="boolean">
                        <label>HTTPS Available</label>
-                       <description>Tells if https has been configured on the Freebox</description>
+                       <description>Tells if HTTPS has been configured on the Freebox</description>
                        <advanced>true</advanced>
                        <default>false</default>
                </parameter>
                <parameter name="httpsPort" type="integer">
                        <label>HTTPS port</label>
-                       <description>Port to use for remote https access to the Freebox Api</description>
+                       <description>Port to use for HTTPS access to the Freebox Api</description>
                        <advanced>true</advanced>
-                       <default>15682</default>
+                       <default>443</default>
                </parameter>
                <parameter name="wsReconnectInterval" type="integer" min="0" max="1440" required="false" unit="min">
                        <label>Websocket Reconnect Interval</label>

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 e6c76e61881c7f8ec9825a356a9dc6f83ffa1097..16008685fa6c741d60031dd82307369851aaad47 100644 (file)
--- 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