loolwsd/LOOLWSD.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
New commits: commit 8b074036293edf77233df061a2a6fe72849d6a93 Author: Andras Timar <andras.ti...@collabora.com> Date: Mon Jun 27 07:37:04 2016 +0200 loolwsd: use LOOLWSD_CONFIGDIR and LOOLWSD_CACHEDIR in default config diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index 8e87bde..903dad3 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -1227,7 +1227,7 @@ void LOOLWSD::initialize(Application& self) // Add default values of new entries here. static const std::map<std::string, std::string> DefAppConfig = { - { "tile_cache_path", "/usr/local/var/cache/loolwsd" }, + { "tile_cache_path", LOOLWSD_CACHEDIR }, { "sys_template_path", "systemplate" }, { "lo_template_path", "/opt/collaboraoffice5.0" }, { "child_root_path", "jails" }, @@ -1239,9 +1239,9 @@ void LOOLWSD::initialize(Application& self) { "loleaflet_html", "loleaflet.html" }, { "logging.color", "true" }, { "logging.level", "trace" }, - { "ssl.cert_file_path", "/etc/loolwsd/cert.pem" }, - { "ssl.key_file_path", "/etc/loolwsd/key.pem" }, - { "ssl.ca_file_path", "/etc/loolwsd/ca-chain.cert.pem" }, + { "ssl.cert_file_path", LOOLWSD_CONFIGDIR "/cert.pem" }, + { "ssl.key_file_path", LOOLWSD_CONFIGDIR "/key.pem" }, + { "ssl.ca_file_path", LOOLWSD_CONFIGDIR "/ca-chain.cert.pem" }, { "storage.filesystem[@allow]", "false" }, { "storage.wopi[@allow]", "true" }, { "storage.wopi.host[0][@allow]", "true" }, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits