[Libreoffice-commits] online.git: Branch 'distro/collabora/milestone-4' - 3 commits - loolwsd/configure.ac loolwsd/debian

[Tor Lillqvist]

 loolwsd/configure.ac            |    2 +-
 loolwsd/debian/loolwsd.postinst |   31 +++++++++++++++++++++++++++++++
 loolwsd/debian/loolwsd.service  |   13 +++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)

New commits:
commit 5f58c4e7d3e197ea72233a5407d9cfd1edaea797
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Aug 6 20:09:27 2015 +0300

    Bump version to 1.2.9 after tarball

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 0f9010f..3e9e7a9 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.2.8], [libreoffice at collabora.com])
+AC_INIT([loolwsd], [1.2.9], [libreoffice at collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit 6f65dbc4c79e844ceee4233f600876bd5acad92d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Aug 6 20:02:28 2015 +0300

    Bump version to 1.2.8 for tarball and packaging

diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 00ae44d..0f9010f 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.69])
 
-AC_INIT([loolwsd], [1.2.7], [libreoffice at collabora.com])
+AC_INIT([loolwsd], [1.2.8], [libreoffice at collabora.com])
 
 AM_INIT_AUTOMAKE([1.11 silent-rules])
 
commit f81092d2bb7a68b47d2a7e6c07bdf30c43a94c9f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Aug 6 20:01:06 2015 +0300

    Set up a lool user, group and systemd service on Debian, too

diff --git a/loolwsd/debian/loolwsd.postinst b/loolwsd/debian/loolwsd.postinst
new file mode 100755
index 0000000..5b0b265
--- /dev/null
+++ b/loolwsd/debian/loolwsd.postinst
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+    configure)
+	setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolwsd
+
+	adduser --quiet --system --group --home /opt/lool lool
+	mkdir -p /var/cache/loolwsd && chmod og+w /var/cache/loolwsd
+
+	# We assume that the LibreOffice to be used is built TDF-style
+	# and installs in /opt/libreoffice5.0, and that /opt/lool is
+	# on the same file system
+
+	mkdir -p /opt/lool/child-roots
+	chown lool /opt/lool/child-roots
+
+	rm -rf /opt/lool/systemplate
+	su lool --shell=/bin/sh -c "loolwsd-systemplate-setup /opt/lool/systemplate /opt/libreoffice5.0 >/dev/null"
+	;;
+
+esac
+
+if [ -d /run/systemd/system ]; then
+    systemctl --system daemon-reload >/dev/null || true
+    systemctl enable loolwsd.service >/dev/null || true
+    deb-systemd-invoke start loolwsd.service >/dev/null || true
+fi
+
+exit 0
diff --git a/loolwsd/debian/loolwsd.service b/loolwsd/debian/loolwsd.service
new file mode 100644
index 0000000..19fb82c
--- /dev/null
+++ b/loolwsd/debian/loolwsd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=LibreOffice On-Line WebSocket Daemon
+After=network.target
+
+[Service]
+EnvironmentFile=-/etc/sysconfig/loolwsd
+ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate --lotemplate=/opt/libreoffice5.0 --childroot=/opt/lool/child-roots --numprespawns=5
+User=lool
+KillMode=process
+Restart=always
+
+[Install]
+WantedBy=multi-user.target