[Libreoffice-commits] online.git: loolwsd/.gitignore loolwsd/loolwsd.xml loolwsd/loolwsd.xml.in

[Andras Timar]

 loolwsd/.gitignore     |    1 +
 loolwsd/loolwsd.xml    |   35 -----------------------------------
 loolwsd/loolwsd.xml.in |   35 +++++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 35 deletions(-)

New commits:
commit a9fb211118153b2a56ad33c03203f05bbf19fc47
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Apr 14 14:59:27 2016 +0200

    loolwsd: move loolwsd.xml to loolwsd.xml.in

diff --git a/loolwsd/.gitignore b/loolwsd/.gitignore
index 2bc08f0..ca7b0e8 100644
--- a/loolwsd/.gitignore
+++ b/loolwsd/.gitignore
@@ -7,6 +7,7 @@
 Makefile
 Makefile.in
 loolwsd.spec
+loolwsd.xml
 aclocal.m4
 autom4te.cache
 config.h
diff --git a/loolwsd/loolwsd.xml b/loolwsd/loolwsd.xml.in
similarity index 95%
rename from loolwsd/loolwsd.xml
rename to loolwsd/loolwsd.xml.in
index 60738c2..e944569 100644
--- a/loolwsd/loolwsd.xml
+++ b/loolwsd/loolwsd.xml.in
@@ -1,6 +1,6 @@
 <config>
 
-    <tile_cache_path desc="Path to a directory where to keep the persistent tile cache." type="path" relative="false" default="/usr/local/var/cache/loolwsd"></tile_cache_path>
+    <tile_cache_path desc="Path to a directory where to keep the persistent 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.0"></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>