loolwsd/LOOLWSD.cpp | 3 +++ loolwsd/loolwsd.properties | 5 +++++ 2 files changed, 8 insertions(+)
New commits: commit 8a6cfdf961ee63be6eb13321fb728d9168c58a7c Author: Henry Castro <hcas...@collabora.com> Date: Wed Mar 16 15:52:01 2016 -0400 loolwsd: load default configuration files diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index 499391b..2c47456 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -947,6 +947,9 @@ LOOLWSD::~LOOLWSD() void LOOLWSD::initialize(Application& self) { + // load default configuration files, if present + loadConfiguration(); + ServerApplication::initialize(self); } diff --git a/loolwsd/loolwsd.properties b/loolwsd/loolwsd.properties new file mode 100644 index 0000000..0d83839 --- /dev/null +++ b/loolwsd/loolwsd.properties @@ -0,0 +1,5 @@ +# The Libre Office Online WOPI Client sets the request scheme, +# hostname and port at the server uses to identify itself. +loolwsd.wopi.scheme = http +loolwsd.wopi.hostname = localhost +loolwsd.wopi.port = 9980 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits