.gitignore | 2 +-
Makefile.am | 12 +++++++++++-
configure.ac | 14 +++++++-------
debian/control | 2 +-
debian/loolwsd.postinst.in | 4 ++--
debian/rules | 8 ++++----
loolwsd.service | 2 +-
loolwsd.spec.in | 13 +++++++------
loolwsd.xml.in | 2 +-
maketarballfordeb.sh.in | 14 --------------
wsd/LOOLWSD.cpp | 2 +-
11 files changed, 36 insertions(+), 39 deletions(-)
New commits:
commit 11fc3a0d02ab627ba160e699b1945902b60ad61a
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Mar 20 23:22:26 2017 +0100
package debian/ files and make them generic
Change-Id: Ia060b7d83c659db0354a5a1438b12bebaee45e03
diff --git a/.gitignore b/.gitignore
index 5bf8d783..6eaa7f0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ ltmain.sh
missing
stamp-h1
m4
+debian/loolwsd.postinst
# Test stuff
systemplate
diff --git a/Makefile.am b/Makefile.am
index a47a1853..80aed7c6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -197,6 +197,15 @@ EXTRA_DIST = discovery.xml \
loolwsd.service \
robots.txt \
sysconfig.loolwsd \
+ debian/compat \
+ debian/copyright \
+ debian/loolwsd.cron.d \
+ debian/loolwsd.preinst \
+ debian/rules \
+ debian/source/format \
+ debian/changelog \
+ debian/control \
+ debian/loolwsd.postinst \
etc/key.pem \
etc/cert.pem \
etc/ca-chain.cert.pem
diff --git a/configure.ac b/configure.ac
index f34c82fd..d89845da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -314,7 +314,8 @@ AC_CONFIG_FILES([Makefile
test/Makefile
loleaflet/Makefile
loolwsd.spec
- loolwsd.xml])
+ loolwsd.xml
+ debian/loolwsd.postinst])
AC_CONFIG_FILES([test/run_unit.sh],[chmod +x test/run_unit.sh])
AC_OUTPUT
diff --git a/debian/control b/debian/control
index 24914db8..c4dc9c60 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.7
Package: loolwsd
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0,
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2,
cpio, collaboraofficebasis5.3-base, collaboraofficebasis5.3-calc,
collaboraofficebasis5.3-core, collaboraofficebasis5.3-draw,
collaboraofficebasis5.3-extension-beanshell-script-provider,
collaboraofficebasis5.3-extension-ct2n,
collaboraofficebasis5.3-extension-javascript-script-provider,
collaboraofficebasis5.3-extension-mediawiki-publisher,
collaboraofficebasis5.3-extension-nlpsolver,
collaboraofficebasis5.3-extension-numbertext,
collaboraofficebasis5.3-extension-pdf-import,
collaboraofficebasis5.3-extension-report-builder,
collaboraofficebasis5.3-gnome-integration,
collaboraofficebasis5.3-graphicfilter, collaboraofficebasis5.3-images,
collaboraofficebasis5.3-impress, collaboraofficebasis5.3-librelogo,
collaboraofficebasis5.3-math, collaboraofficebasis5.3-ogltrans,
collaboraofficebasis5.3-ooofonts, collaboraofficebasis5.3-oooling
uistic, collaboraofficebasis5.3-postgresql-sdbc,
collaboraofficebasis5.3-python-script-provider, collaboraofficebasis5.3-pyuno,
collaboraofficebasis5.3-writer, collaboraofficebasis5.3-xsltfilter,
collaboraoffice5.3, collaboraoffice5.3-base, collaboraoffice5.3-calc,
collaboraoffice5.3-dict-en, collaboraoffice5.3-draw,
collaboraoffice5.3-debian-menus, collaboraoffice5.3-impress,
collaboraoffice5.3-math, collaboraoffice5.3-ure, collaboraoffice5.3-writer,
collaboraofficebasis5.3-en-us, collaboraofficebasis5.3-en-us-base,
collaboraofficebasis5.3-en-us-calc, collaboraofficebasis5.3-en-us-math,
collaboraofficebasis5.3-en-us-res, collaboraofficebasis5.3-en-us-writer,
collaboraoffice5.3-en-us
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0,
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2,
cpio, ${lo:Depends}
Description: LibreOffice Online WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
services.
diff --git a/debian/loolwsd.postinst b/debian/loolwsd.postinst.in
similarity index 83%
rename from debian/loolwsd.postinst
rename to debian/loolwsd.postinst.in
index 765e4f3d..fe7eb49a 100755
--- a/debian/loolwsd.postinst
+++ b/debian/loolwsd.postinst.in
@@ -12,7 +12,7 @@ case "$1" in
rm -rf /var/cache/loolwsd/*
# We assume that the LibreOffice to be used is built TDF-style
- # and installs in /opt/collaboraoffice5.3, and that /opt/lool is
+ # and installs in @LO_PATH@, and that /opt/lool is
# on the same file system
rm -rf /opt/lool
@@ -20,7 +20,7 @@ case "$1" in
chown lool: /opt/lool
chown lool: /opt/lool/child-roots
- su lool --shell=/bin/sh -c "loolwsd-systemplate-setup
/opt/lool/systemplate /opt/collaboraoffice5.3 >/dev/null 2>&1"
+ su lool --shell=/bin/sh -c "loolwsd-systemplate-setup
/opt/lool/systemplate @LO_PATH@ >/dev/null 2>&1"
;;
esac
diff --git a/debian/rules b/debian/rules
index 8a7224d5..b725d6a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,9 +21,9 @@ override_dh_auto_configure:
override_dh_auto_test:
# do not test
-override_dh_auto_install:
- make install DESTDIR=`pwd`/debian/loolwsd/
- cp -ar `pwd`/loleaflet `pwd`/debian/loolwsd/usr/share/loolwsd
-
override_dh_installinit:
# no init.d scripts here, assume systemd
+
+override_dh_gencontrol:
+ # put package names of LibreOffice here
+ # dh_gencontrol -- -Vlo:Depends=""
commit 2828fc1684673b6ff080ed08aaed04f997bb6b23
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Mar 20 21:16:11 2017 +0100
no need for maketarballfordeb.sh any more
Change-Id: I18dd9e8fbd28431d49c67d40db521e0fdb6d3f27
diff --git a/.gitignore b/.gitignore
index 5ee07ffd..5bf8d783 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,7 +28,6 @@ depcomp
install-sh
libtool
ltmain.sh
-maketarballfordeb.sh
missing
stamp-h1
m4
diff --git a/configure.ac b/configure.ac
index dfd70953..f34c82fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -314,8 +314,7 @@ AC_CONFIG_FILES([Makefile
test/Makefile
loleaflet/Makefile
loolwsd.spec
- loolwsd.xml
- maketarballfordeb.sh])
+ loolwsd.xml])
AC_CONFIG_FILES([test/run_unit.sh],[chmod +x test/run_unit.sh])
AC_OUTPUT
diff --git a/maketarballfordeb.sh.in b/maketarballfordeb.sh.in
deleted file mode 100644
index 2f4c27c0..00000000
--- a/maketarballfordeb.sh.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-TEMPDIR=`mktemp -d`
-SRCDIR=`pwd`
-cd $TEMPDIR
-tar xzf $SRCDIR/loolwsd-@package_vers...@.tar.gz
-cp -a $SRCDIR/debian loolwsd-@PACKAGE_VERSION@
-mkdir -p loolwsd-@PACKAGE_VERSION@/loleaflet
-cd loolwsd-@PACKAGE_VERSION@/loleaflet
-tar xzf $SRCDIR/loleaflet/loleaflet-@package_vers...@.tar.gz
--strip-components=1
-cd $TEMPDIR
-tar czf $SRCDIR/loolwsd_@package_vers...@.orig.tar.gz loolwsd-@PACKAGE_VERSION@
-cd $SRCDIR
-rm -rf $TEMPDIR
commit ef23ab447d859aad7ac2824e7d61c2aec1cf42c8
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Mar 20 21:12:36 2017 +0100
don't hardcode lo_template_path, use the setting from loolwsd.xml
Change-Id: Ibb18d70ee24fd5ceefdd937a406c2f168997d1aa
diff --git a/loolwsd.service b/loolwsd.service
index 2a7125ed..d43d5907 100644
--- a/loolwsd.service
+++ b/loolwsd.service
@@ -4,7 +4,7 @@ After=network.target
[Service]
EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStart=/usr/bin/loolwsd --version
--o:sys_template_path=/opt/lool/systemplate
--o:lo_template_path=/opt/collaboraoffice5.3
--o:child_root_path=/opt/lool/child-roots
--o:file_server_root_path=/usr/share/loolwsd
+ExecStart=/usr/bin/loolwsd --version
--o:sys_template_path=/opt/lool/systemplate
--o:child_root_path=/opt/lool/child-roots
--o:file_server_root_path=/usr/share/loolwsd
User=lool
KillMode=control-group
Restart=always
commit f97a59b559631b1a46361d4875a3f192c9fef4ee
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Mar 20 20:24:50 2017 +0100
RPM packager should define 'vendor'
Change-Id: I545251e9d2f18c90f5dc76b8c56b2c2cf338c81d
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 2bdd31a6..ebb934f5 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -13,7 +13,7 @@ Name: loolwsd
%endif
Version: @PACKAGE_VERSION@
Release: 1%{?dist}
-Vendor: Collabora
+Vendor: %{vendor}
Summary: LibreOffice Online WebSocket Daemon
License: MPL
Source0: loolwsd-@package_vers...@.tar.gz
commit 29120b44547a3148be9b781b0f5b388750c68f7f
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Mar 20 20:04:04 2017 +0100
Packager should know where LibreOffice is installed in target distro
Change-Id: Ie7e34be8eb34f60a41edbef22838828be0008e37
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 4129e470..2bdd31a6 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -63,6 +63,7 @@ Obsoletes: loleaflet <= 1.5.8
%build
%configure \
--with-lokit-path=bundled/include \
+ --with-lo-path=%{loroot} \
%if 0%{?config_options:1}
%{config_options}
%endif
@@ -131,7 +132,7 @@ rm -rf /var/cache/loolwsd/*
# Figure out where LO is installed, let's hope it is not a mount point
# Create a directory for loolwsd on the same file system
-loroot=`rpm -ql collaboraoffice5.3 | grep '/soffice$' | sed -e
's-/program/soffice--'`
+loroot=%{loroot}
loolparent=`cd ${loroot} && cd .. && /bin/pwd`
rm -rf ${loolparent}/lool
commit b408d4b2d91e4a06f9b69bee45356f411da98732
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Mar 20 19:47:27 2017 +0100
Use the name LibreOffice in loolwsd.spec file
Change-Id: I2fddb9c4baee08f461c328e35d95086825c691d0
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 1769b221..4129e470 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -33,7 +33,7 @@ Requires(post): coreutils grep sed
# loolwsd dependencies
Requires: expat keyutils-libs krb5-libs libattr libcap libcom_err libgcc
libpng libselinux openssl-libs pcre xz-libs zlib
Requires: poco-crypto >= 1.7.5 poco-foundation >= 1.7.5 poco-json >=
1.7.5 poco-net >= 1.7.5 poco-netssl >= 1.7.5 poco-util >= 1.7.5 poco-xml >=
1.7.5
-# Collabora Office dependencies (unfortunately Collabora Office RPM packages
does not have real dependencies)
+# LibreOffice dependencies (unfortunately upstream LibreOffice RPM packages
(from TDF) do not have real dependencies)
Requires: atk avahi-glib avahi-libs bzip2-libs cairo cups-libs dbus-glib
dbus-libs fontconfig freetype GConf2 gdk-pixbuf2 glib2 gnome-vfs2 graphite2
gstreamer gstreamer-plugins-base gtk2 harfbuzz libdrm libffi libICE libSM
libuuid libX11 libXau libxcb libXcomposite libXcursor libXdamage libXext
libXfixes libXi libXinerama libXrandr libXrender libxshmfence libXt libXxf86vm
mesa-libEGL mesa-libgbm mesa-libGL mesa-libglapi pango pixman
%else
%if 0%{?suse_version}
@@ -41,7 +41,7 @@ Requires: atk avahi-glib avahi-libs bzip2-libs cairo
cups-libs dbus-glib d
Requires(post): libcap-progs
Requires: libcap2 libopenssl1_0_0 libpng12-0 libpcre1 libz1
%{?systemd_requires} %{fillup_prereq}
Requires: libPocoCrypto48 >= 1.7.8 libPocoFoundation48 >= 1.7.8
libPocoJSON48 >= 1.7.8 libPocoNet48 >= 1.7.8 libPocoNetSSL48 >= 1.7.8
libPocoUtil48 >= 1.7.8 libPocoXML48 >= 1.7.8
-# Collabora Office dependencies (unfortunately Collabora Office RPM packages
does not have real dependencies)
+# LibreOffice dependencies (unfortunately upstream LibreOffice RPM packages
(from TDF) do not have real dependencies)
Requires: Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib
fontconfig libatk-1_0-0 libavahi-client3 libavahi-common3 libavahi-glib1
libbz2-1 libcairo2 libcom_err2 libdbus-1-3 libdrm2 libexpat1 libfreetype6
libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0
libgraphite2-3 libgthread-2_0-0 libgtk-2_0-0 libharfbuzz0 libkeyutils1 liblzma5
libpixman-1-0 libpng16-16 libuuid1 libxml2 libffi4 libgbm1 libICE6 libselinux1
libSM6 libwayland-client0 libwayland-server0 libX11-6 libX11-xcb1 libXau6
libxcb1 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-render0
libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libXdamage1 libXext6 libXfixes3
libXrender1 libxshmfence1 libXxf86vm1
%endif
%endif
commit 271a4cce2f39cb52fc9393091a518b3966f386bb
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Mar 20 19:45:06 2017 +0100
add loolwsd.spec to dist tarball
Change-Id: I919c5a1a41a16dfd1806390865ed840a652cf9e2
diff --git a/Makefile.am b/Makefile.am
index 0ad5a1f0..a47a1853 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -192,6 +192,7 @@ noinst_HEADERS = $(wsd_headers) $(shared_headers)
$(kit_headers) \
EXTRA_DIST = discovery.xml \
favicon.ico \
loolkitconfig.xcu \
+ loolwsd.spec \
loolwsd.xml.in \
loolwsd.service \
robots.txt \
commit d6be72d73ccf1b954043d22f76176421cc7a8a8b
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Mar 20 19:38:17 2017 +0100
For generality, introduce %{lo_rpm_list} macro
Give the list of libreoffice packages as requirement in rpmbuild command
line.
rpmbuld --define 'lo_rpm_list <list of rpms>'
Change-Id: I2084df6078edd21872a7e303e5c717b5b0652902
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 9b64cbf9..1769b221 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -26,7 +26,7 @@ BuildRequires: libcap-progs systemd-rpm-macros
%endif
%endif
-Requires: collaboraoffice5.3 collaboraoffice5.3-en-US
collaboraoffice5.3-ure collaboraofficebasis5.3-core
collaboraofficebasis5.3-writer collaboraofficebasis5.3-impress
collaboraofficebasis5.3-graphicfilter collaboraofficebasis5.3-en-US
collaboraofficebasis5.3-calc collaboraofficebasis5.3-en-US-res
collaboraofficebasis5.3-en-US-calc collaboraofficebasis5.3-ooofonts
collaboraofficebasis5.3-images collaboraofficebasis5.3-filter-data
collaboraofficebasis5.3-draw collaboraofficebasis5.3-base
collaboraofficebasis5.3-en-US-writer collaboraofficebasis5.3-en-US-math
collaboraofficebasis5.3-en-US-base
+Requires: %{lo_rpm_list}
Requires: systemd
Requires(post): coreutils grep sed
%if 0%{?fedora} || 0%{?rhel} >= 7
commit a3bb506c9d42126ffcddb97df5c03f02f27944a3
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Mar 20 19:32:28 2017 +0100
Poco was updated in SUSE repos
Change-Id: I6406adf979e82ab9d5a907ae31cadff458cc67f3
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 4430954b..9b64cbf9 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -40,7 +40,7 @@ Requires: atk avahi-glib avahi-libs bzip2-libs cairo
cups-libs dbus-glib d
# loolwsd dependencies
Requires(post): libcap-progs
Requires: libcap2 libopenssl1_0_0 libpng12-0 libpcre1 libz1
%{?systemd_requires} %{fillup_prereq}
-Requires: libPocoCrypto45 >= 1.7.5 libPocoFoundation45 >= 1.7.5
libPocoJSON45 >= 1.7.5 libPocoNet45 >= 1.7.5 libPocoNetSSL45 >= 1.7.5
libPocoUtil45 >= 1.7.5 libPocoXML45 >= 1.7.5
+Requires: libPocoCrypto48 >= 1.7.8 libPocoFoundation48 >= 1.7.8
libPocoJSON48 >= 1.7.8 libPocoNet48 >= 1.7.8 libPocoNetSSL48 >= 1.7.8
libPocoUtil48 >= 1.7.8 libPocoXML48 >= 1.7.8
# Collabora Office dependencies (unfortunately Collabora Office RPM packages
does not have real dependencies)
Requires: Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib
fontconfig libatk-1_0-0 libavahi-client3 libavahi-common3 libavahi-glib1
libbz2-1 libcairo2 libcom_err2 libdbus-1-3 libdrm2 libexpat1 libfreetype6
libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0
libgraphite2-3 libgthread-2_0-0 libgtk-2_0-0 libharfbuzz0 libkeyutils1 liblzma5
libpixman-1-0 libpng16-16 libuuid1 libxml2 libffi4 libgbm1 libICE6 libselinux1
libSM6 libwayland-client0 libwayland-server0 libX11-6 libX11-xcb1 libXau6
libxcb1 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-render0
libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libXdamage1 libXext6 libXfixes3
libXrender1 libxshmfence1 libXxf86vm1
%endif
commit 2cf1f2243983f59174a534021d0505896be22872
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Mar 20 19:07:01 2017 +0100
Use LO_PATH instead of hardcoded path as config default
Change-Id: I0d6ce9e7938e2521e764978526fe2d9ce632c992
diff --git a/Makefile.am b/Makefile.am
index 3add0d12..0ad5a1f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \
diff --git a/configure.ac b/configure.ac
index b389d691..dfd70953 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 360bde1c..20fc0dd6 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -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>
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index f7e0f6e7..ba13caba 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -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", "" },
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
