wsd: set SSL setting in loolwsd.xml based on configure --enable-ssl

Change-Id: I18f4c0cf4f5ec02a685d0721981a98396eb834fb
private/kendy/mobile
Ashod Nakashian 2018-06-03 17:51:43 -04:00
parent a7a03c3c5d
commit 1e51b02db5
2 changed files with 3 additions and 2 deletions

View File

@ -329,12 +329,13 @@ AS_IF([test "$enable_ssl" != "no"],
AM_CONDITIONAL([ENABLE_SSL], [test "$enable_ssl" != "no"])
AM_CONDITIONAL([ENABLE_DEBUG], [test "$ENABLE_DEBUG" = "true"])
ENABLE_SSL=
ENABLE_SSL=true
if test "$enable_ssl" != "no"; then
ssl_msg="ssl enabled"
ENABLE_SSL=true
else
ssl_msg="insecure: ssl disabled"
ENABLE_SSL=false
fi
AC_SUBST(ENABLE_SSL)

View File

@ -76,7 +76,7 @@
</net>
<ssl desc="SSL settings">
<enable type="bool" default="true">true</enable>
<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>
<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>