haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

loolwsd: move configuration boilerplate 

...and restored SSL file names temporarily.

Change-Id: I3195fcb888dc282723996321ceefb17088b593d2
Reviewed-on: https://gerrit.libreoffice.org/23468
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
private/hcvcastro/socket
Ashod Nakashian 2016-03-23 07:56:46 -04:00 committed by Ashod Nakashian
parent b4e4ccb666
commit 3f3c1bfae9
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
loolwsd/Common.hpp
View File

@ -36,6 +36,8 @@ constexpr int SMALL_MESSAGE_SIZE = READ_BUFFER_SIZE / 2;
static const std::string JailedDocumentRoot = "/user/docs/";
static const std::string CHILD_URI = "/loolws/child?";
static const std::string LOLEAFLET_PATH = "/loleaflet/dist/loleaflet.html?";
static const std::string SSL_CERT_FILE = "cert.pem";
static const std::string SSL_KEY_FILE = "key.pem";
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

17
loolwsd/loolwsd.xml
View File

@ -1,6 +1,19 @@
<config>
<ssl desc="SSL settings">
<cert_file_path desc="path to the cert file" relative="true">cert.pem</cert_file_path>
<key_file_path desc="path to the key file" relative="true">key.pem</key_file_path>
<cert_file_path desc="Path to the cert file" relative="true">cert.pem</cert_file_path>
<key_file_path desc="Path to the key file" relative="true">key.pem</key_file_path>
</ssl>
<storage desc="Backend storage">
<filesystem allow="true">
<path desc="loleaflet is a must" allow="true" recurse="true" relative="true">loleaflet</path>
<path desc="/tmp is used for testing" allow="true" recurse="false" relative="false">/tmp</path>
</filesystem>
<wopi desc="Allow/deny wopi storage. Mutually exclusive with webdav." allow="true">
<host desc="Hostname to allow">localhost</host>
<max_file_size desc="Maximum document size in bytes to load. 0 for unlimited." type="uint">0</max_file_size>
</wopi>
<webdav desc="Allow/deny webdav storage. Mutually exclusive with wopi." allow="false">
<host desc="Hostname to allow">localhost</host>
</webdav>
</storage>
</config>