[Libreoffice-commits] online.git: loolwsd/Common.hpp loolwsd/loolwsd.xml

[Ashod Nakashian]

 loolwsd/Common.hpp  |    2 ++
 loolwsd/loolwsd.xml |   17 +++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 3f3c1bfae93edfe89b77c2ce3173b3cd7c767938
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Wed Mar 23 07:56:46 2016 -0400

    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 at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/Common.hpp b/loolwsd/Common.hpp
index d96a09d..2f44df2 100644
--- a/loolwsd/Common.hpp
+++ b/loolwsd/Common.hpp
@@ -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: */
diff --git a/loolwsd/loolwsd.xml b/loolwsd/loolwsd.xml
index a2d0f2e..2bdc6ea 100644
--- a/loolwsd/loolwsd.xml
+++ b/loolwsd/loolwsd.xml
@@ -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>