diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2016-09-01 16:24:22 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-09-01 16:24:35 +0200 |
| commit | e41e10750070210103b1a92b2905d38f38a74a2f (patch) | |
| tree | f3b569563c9c568fb23bdb99906927600501d9dd | |
| parent | be4e71c0f0d62d7962396b6242f94e9e7dfc5f57 (diff) | |
Fix --disable-ssl case.collabora-online-1-9-branch-point
| -rw-r--r-- | loolwsd/LOOLWSD.cpp | 4 | ||||
| -rw-r--r-- | loolwsd/loolwsd.xml.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index db7f13503..c2c706846 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -1439,7 +1439,11 @@ void LOOLWSD::initialize(Application& self) Log::warn("SSL support: SSL is disabled."); } +#if ENABLE_SSL LOOLWSD::SSLTermination.set(getConfigValue<bool>(conf, "ssl.termination", true)); +#else + LOOLWSD::SSLTermination.set(false); +#endif Cache = getPathFromConfig("tile_cache_path"); SysTemplate = getPathFromConfig("sys_template_path"); diff --git a/loolwsd/loolwsd.xml.in b/loolwsd/loolwsd.xml.in index 2cbf667aa..6ddba267a 100644 --- a/loolwsd/loolwsd.xml.in +++ b/loolwsd/loolwsd.xml.in @@ -35,7 +35,7 @@ <ssl desc="SSL settings"> <enable type="bool" default="true">true</enable> - <termination type="bool" default="true">true</termination> + <termination desc="Connection via proxy where loolwsd acts as working via https, but actually uses http." type="bool" default="true">true</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> <ca_file_path desc="Path to the ca file" relative="false">/etc/loolwsd/ca-chain.cert.pem</ca_file_path> |