[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - debian/loolwsd.service loolwsd.service

[Andras Timar]

 debian/loolwsd.service |    2 +-
 loolwsd.service        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c9aa6948969f91bfa431b631b2002ee1121f488f
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue May 9 14:21:41 2017 +0200

    Revert "don't hardcode lo_template_path, use the setting from loolwsd.xml"
    
    This reverts commit ef23ab447d859aad7ac2824e7d61c2aec1cf42c8.
    loolwsd.xml from Collabora Online 2.0 or older may contain wrong default for lo_template_path,
    therefore after an upgrade, loolwsd would fail to start, or it would start wrong LibreOffice.
    In Collabora's product this path is not really configurable, so it makes sense to hardcode it.
    Upstream is more flexible in this regard.
    
    Change-Id: I38f635f5fbff62fcd32aa1fd8f0b3c05b8030b08
    Reviewed-on: https://gerrit.libreoffice.org/37429
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/debian/loolwsd.service b/debian/loolwsd.service
index d43d5907..2a7125ed 100644
--- a/debian/loolwsd.service
+++ b/debian/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: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:lo_template_path=/opt/collaboraoffice5.3 --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd
 User=lool
 KillMode=control-group
 Restart=always
diff --git a/loolwsd.service b/loolwsd.service
index d43d5907..2a7125ed 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: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:lo_template_path=/opt/collaboraoffice5.3 --o:child_root_path=/opt/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd
 User=lool
 KillMode=control-group
 Restart=always