strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use LO_PATH instead of hardcoded path as config default

Browse source 
Change-Id: I0d6ce9e7938e2521e764978526fe2d9ce632c992
This commit is contained in:
Andras Timar 2017-03-20 19:07:01 +01:00
parent 064b2508a7
commit 2cf1f22439
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.am
View file

@ -153,7 +153,7 @@ shared_headers = common/Common.hpp \
common/IoUtil.hpp \
common/FileUtil.hpp \
common/Log.hpp \
common/LOOLWebSocket.hpp \
common/LOOLWebSocket.hpp \
common/Protocol.hpp \
common/Session.hpp \
common/Unit.hpp \

12
configure.ac
View file

@ -166,31 +166,30 @@ AS_IF([test -n "$with_lokit_path"],
[CPPFLAGS="$CPPFLAGS -I${with_lokit_path}"])
lokit_msg="$with_lokit_path"
dnl
dnl lo_path is not required; but useful for testing.
dnl
LO_PATH=
LO_PATH="/usr/lib64/libreoffice"
JAIL_PATH=not-set
SYSTEMPLATE_PATH=not-set
have_lo_path=false
AC_MSG_CHECKING([whether to run tests against a LibreOffice])
if test -n "$with_lo_path"; then
LO_PATH="$with_lo_path"
version_file="$with_lo_path/program/versionrc"
if test -f $version_file; then
LO_PATH="$with_lo_path"
JAILS_PATH="\${abs_top_builddir}/jails"
SYSTEMPLATE_PATH="\${abs_top_builddir}/systemplate"
have_lo_path=true
lo_msg="test against $LO_PATH"
AC_MSG_RESULT([yes])
else
AC_MSG_ERROR([LibreOffice install looks dodgy, missing $version_file])
lo_msg="no integration tests"
AC_MSG_RESULT([no])
fi
else
lo_msg="no integration tests"
AC_MSG_RESULT([no])
fi
AC_SUBST(LO_PATH)
AC_DEFINE_UNQUOTED([LO_PATH],["$LO_PATH"],[Path to LibreOffice installation])
AC_SUBST(JAILS_PATH)
AC_SUBST(SYSTEMPLATE_PATH)
AM_CONDITIONAL(HAVE_LO_PATH,[test "$have_lo_path" = "true"])
@ -326,6 +325,7 @@ AC_LANG_POP
echo "
Configuration:
LOKit path ${lokit_msg}
LO path $LO_PATH
LO integration tests ${lo_msg}
SSL support $ssl_msg
Debug & low security $debug_msg

2
loolwsd.xml.in
View file

@ -5,7 +5,7 @@
<tile_cache_path desc="Path to a directory where to keep the tile cache." type="path" relative="false" default="@LOOLWSD_CACHEDIR@"></tile_cache_path>
<sys_template_path desc="Path to a template tree with shared libraries etc to be used as source for chroot jails for child processes." type="path" relative="true" default="systemplate"></sys_template_path>
<lo_template_path desc="Path to a LibreOffice installation tree to be copied (linked) into the jails for child processes. Should be on the same file system as systemplate." type="path" relative="false" default="/opt/collaboraoffice5.3"></lo_template_path>
<lo_template_path desc="Path to a LibreOffice installation tree to be copied (linked) into the jails for child processes. Should be on the same file system as systemplate." type="path" relative="false" default="@LO_PATH@"></lo_template_path>
<child_root_path desc="Path to the directory under which the chroot jails for the child processes will be created. Should be on the same file system as systemplate and lotemplate. Must be an empty directory." type="path" relative="true" default="jails"></child_root_path>
<server_name desc="Hostname:port of the server running loolwsd. If empty, it's derived from the request." type="string" default=""></server_name>

2
wsd/LOOLWSD.cpp
View file

@ -643,7 +643,7 @@ void LOOLWSD::initialize(Application& self)
static const std::map<std::string, std::string> DefAppConfig
= { { "tile_cache_path", LOOLWSD_CACHEDIR },
{ "sys_template_path", "systemplate" },
{ "lo_template_path", "/opt/collaboraoffice5.3" },
{ "lo_template_path", LO_PATH },
{ "child_root_path", "jails" },
{ "lo_jail_subpath", "lo" },
{ "server_name", "" },