configure.ac | 10 ++++++++++
loolwsd.xml.in | 2 +-
wsd/LOOLWSD.cpp | 1 +
3 files changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 279301e51d8975074177c36c33d4b432c0247c98
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Tue Dec 11 12:55:16 2018 +0100
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Dec 11 12:55:16 2018 +0100
New configure switch --enable-vereign to set the default document signing
url
Change-Id: I65225fc5f94a8ad49b75d31ef3535e8479484e69
diff --git a/configure.ac b/configure.ac
index fbde02a02..f8b12322d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,6 +166,9 @@ AC_ARG_ENABLE([werror],
AS_HELP_STRING([--disable-werror],
[Do not turn warnings into errors.]))
+AC_ARG_ENABLE([vereign],
+ AS_HELP_STRING([--enable-vereign],
+ [Set Vereign document_signing_url configuration key
to the default app.vereign.com.]))
# Handle options
AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"],
[POCO_DEBUG_SUFFIX=d],
@@ -303,6 +306,13 @@ AS_IF([test "$MAX_DOCUMENTS" -lt "2"],
AC_DEFINE_UNQUOTED([MAX_DOCUMENTS],[$MAX_DOCUMENTS],[Limit the maximum number
of open documents])
AC_SUBST(MAX_DOCUMENTS)
+VEREIGN_URL=
+if test "$enable_vereign" = "yes"; then
+ VEREIGN_URL="https://app.vereign.com";
+fi
+AC_DEFINE_UNQUOTED([VEREIGN_URL],["$VEREIGN_URL"],[Default value of
per_documents.document_signing_url])
+AC_SUBST(VEREIGN_URL)
+
# Test for build environment
AS_IF([test "$ENABLE_GTKAPP" != true],
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 0ce943bbd..81831e43b 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -17,7 +17,7 @@
<num_prespawn_children desc="Number of child processes to keep started in
advance and waiting for new clients." type="uint"
default="1">1</num_prespawn_children>
<per_document desc="Document-specific settings, including LO Core
settings.">
<max_concurrency desc="The maximum number of threads to use while
processing a document." type="uint" default="4">4</max_concurrency>
- <document_signing_url desc="The endpoint URL of signing server, if
empty the document signing is disabled" type="string"
default=""></document_signing_url>
+ <document_signing_url desc="The endpoint URL of signing server, if
empty the document signing is disabled" type="string"
default="@VEREIGN_URL@">@VEREIGN_URL@</document_signing_url>
<redlining_as_comments desc="If true show red-lines as comments"
type="bool" default="true">true</redlining_as_comments>
<idle_timeout_secs desc="The maximum number of seconds before
unloading an idle document. Defaults to 1 hour." type="uint"
default="3600">3600</idle_timeout_secs>
<!-- Idle save and auto save are checked every 30 seconds -->
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 22d570b53..87cbd070c 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -783,6 +783,7 @@ void LOOLWSD::initialize(Application& self)
{ "net.service_root", "" },
{ "num_prespawn_children", "1" },
{ "per_document.autosave_duration_secs", "300" },
+ { "per_document.document_signing_url", VEREIGN_URL },
{ "per_document.idle_timeout_secs", "3600" },
{ "per_document.idlesave_duration_secs", "30" },
{ "per_document.limit_file_size_mb", "0" },
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
