[Libreoffice-commits] online.git: loolwsd/debian loolwsd/loolwsd.service

[Jan Holesovsky]

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

New commits:
commit 2691d88909543178eb4b326651e56929de3a0757
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Oct 30 11:34:41 2015 +0100

    Revert "loolwsd: Update systemplate with every startup of the service."
    
    This is not a good idea, it takes too long for systemd, and times out.
    
    This reverts commit b42409c3883561411a88b95d927fb30ce03d3a0b.

diff --git a/loolwsd/debian/loolwsd.service b/loolwsd/debian/loolwsd.service
index 36180ff..19fb82c 100644
--- a/loolwsd/debian/loolwsd.service
+++ b/loolwsd/debian/loolwsd.service
@@ -4,8 +4,6 @@ After=network.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStartPre=-rm -rf /opt/lool/systemplate
-ExecStartPre=/usr/bin/loolwsd-systemplate-setup /opt/lool/systemplate /opt/libreoffice5.0
 ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate --lotemplate=/opt/libreoffice5.0 --childroot=/opt/lool/child-roots --numprespawns=5
 User=lool
 KillMode=process
diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service
index 36180ff..19fb82c 100644
--- a/loolwsd/loolwsd.service
+++ b/loolwsd/loolwsd.service
@@ -4,8 +4,6 @@ After=network.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStartPre=-rm -rf /opt/lool/systemplate
-ExecStartPre=/usr/bin/loolwsd-systemplate-setup /opt/lool/systemplate /opt/libreoffice5.0
 ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate --lotemplate=/opt/libreoffice5.0 --childroot=/opt/lool/child-roots --numprespawns=5
 User=lool
 KillMode=process