[Libreoffice-commits] online.git: loolwsd.xml.in

[Andras Timar (via logerrit)]

 loolwsd.xml.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5d57f5aef38d08196952bf22cd310001cbedea1e
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Fri Oct 11 16:55:35 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Oct 11 23:43:09 2019 +0200

    storage.ssl.enable should be in sync with ssl.enable by default
    
    storage.ssl.enable=false by default is not good. loolwsd default config should
    work, e.g. in case of snapshot docker images. When ssl.enable=true, this implies
    storage.ssl.enable=true, because browsers do not allow mixed content, so it is
    not possible to connect to the storage with plain HTTP, while the content from
    loolwsd is served with HTTPS.
    
    TODO: find out what to do in case of upgrade, when the user has an old config
    file. Probably storage.ssl.enable should default to ssl.enable when it is not
    present in config file.
    
    Change-Id: Ifdcb070745d649dd9840dccf2e5641058a13d4e4
    Reviewed-on: https://gerrit.libreoffice.org/80660
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 91c748e93..70a6751e2 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -86,7 +86,7 @@
     </net>
 
     <ssl desc="SSL settings">
-        <enable type="bool" desc="Controls whether SSL encryption is enable (do not disable for production deployment). If default is false, must first be compiled with SSL support to enable." default="@ENABLE_SSL@">@ENABLE_SSL@</enable>
+        <enable type="bool" desc="Controls whether SSL encryption between browser and loolwsd is enabled (do not disable for production deployment). If default is false, must first be compiled with SSL support to enable." default="@ENABLE_SSL@">@ENABLE_SSL@</enable>
         <termination desc="Connection via proxy where loolwsd acts as working via https, but actually uses http." type="bool" default="true">false</termination>
         <cert_file_path desc="Path to the cert file" relative="false">/etc/loolwsd/cert.pem</cert_file_path>
         <key_file_path desc="Path to the key file" relative="false">/etc/loolwsd/key.pem</key_file_path>
@@ -126,7 +126,7 @@
             <host desc="Hostname to allow" allow="false">localhost</host>
         </webdav>
         <ssl desc="SSL settings">
-            <enable type="bool" default="false"></enable>
+            <enable type="bool" desc="Controls whether SSL encryption between storage and loolwsd is enabled. If default is false, must first be compiled with SSL support to enable." default="@ENABLE_SSL@">@ENABLE_SSL@</enable>
             <cert_file_path desc="Path to the cert file" relative="false"></cert_file_path>
             <key_file_path desc="Path to the key file" relative="false"></key_file_path>
             <ca_file_path desc="Path to the ca file" relative="false"></ca_file_path>