loolwsd/LOOLWSD.cpp | 2 +- loolwsd/configure.ac | 2 +- loolwsd/loolwsd.service | 13 +++++++++++++ loolwsd/loolwsd.spec.in | 25 +++++++++++++++++++++++-- loolwsd/sysconfig.loolwsd | 9 +++++++++ 5 files changed, 47 insertions(+), 4 deletions(-)
New commits: commit d3ba2cae5b378a6cbd52bcd44f77daa786ff906b Author: Tor Lillqvist <[email protected]> Date: Mon Jun 1 20:18:53 2015 +0300 Post-release bump diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac index 212520a..43df612 100644 --- a/loolwsd/configure.ac +++ b/loolwsd/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.69]) -AC_INIT([loolwsd], [1.0.32], [[email protected]]) +AC_INIT([loolwsd], [1.0.33], [[email protected]]) AM_INIT_AUTOMAKE([1.11 silent-rules]) commit 3f0bd39a122675ee5067d0ce4cbe4cddb7feaa42 Author: Tor Lillqvist <[email protected]> Date: Mon Jun 1 20:17:15 2015 +0300 Bump version for tarball diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac index 6fa7a55..212520a 100644 --- a/loolwsd/configure.ac +++ b/loolwsd/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.69]) -AC_INIT([loolwsd], [1.0.31], [[email protected]]) +AC_INIT([loolwsd], [1.0.32], [[email protected]]) AM_INIT_AUTOMAKE([1.11 silent-rules]) commit ec681d2cc866a52e548afb38b362825379a1b326 Author: Tor Lillqvist <[email protected]> Date: Mon Jun 1 20:14:40 2015 +0300 For some reason I can't get the $LOOLWSD_NUMPRESPAWNS to work Even though it is set in /etc/sysconfig/loolwsd, it expands to nothing when used in the loolwsd.services file. Oh well. Let's hardcode a value of 5 for now. diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service index be776af..526b272 100644 --- a/loolwsd/loolwsd.service +++ b/loolwsd/loolwsd.service @@ -4,7 +4,7 @@ After=network.target [Service] EnvironmentFile=-/etc/sysconfig/loolwsd -ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate --lotemplate=/opt/libreofficedev5.1 --childroot=/opt/lool/child-roots --numprespawns=$LOOLWSD_NUMPRESPAWNS +ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate --lotemplate=/opt/libreofficedev5.1 --childroot=/opt/lool/child-roots --numprespawns=5 User=lool KillMode=process Restart=always commit 7848cca80c789fb2029a997af77cedfa5ab724d2 Author: Tor Lillqvist <[email protected]> Date: Mon Jun 1 19:53:29 2015 +0300 Try to make this handled by systemd diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service new file mode 100644 index 0000000..be776af --- /dev/null +++ b/loolwsd/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/libreofficedev5.1 --childroot=/opt/lool/child-roots --numprespawns=$LOOLWSD_NUMPRESPAWNS +User=lool +KillMode=process +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in index cec94dc..303912a 100644 --- a/loolwsd/loolwsd.spec.in +++ b/loolwsd/loolwsd.spec.in @@ -22,11 +22,14 @@ Vendor: Collabora Summary: LibreOffice On-Line WebSocket Daemon License: MPL Source0: loolwsd-@[email protected] -BuildRequires: libcap-progs libcap-devel libpng-devel poco-devel >= 1.6.0 +Source1: loolwsd.service +Source2: sysconfig.loolwsd +BuildRequires: libcap-progs libcap-devel libpng-devel poco-devel >= 1.6.0 systemd-rpm-macros # This works for now only with the TDF nightly builds of 5.0 or 5.1, I # think. But the TDF packages include the version number in their # names. How clever is that? So we need to specify one. Requires: libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0 libPocoNet30 >= 1.6.0 libreofficedev5.1 libreofficedev5.1-en-US libreofficedev5.1-ure lodevbasis5.1-core lodevbasis5.1-writer lodevbasis5.1-impress lodevbasis5.1-graphicfilter lodevbasis5.1-en-US lodevbasis5.1-calc lodevbasis5.1-en-US-res lodevbasis5.1-en-US-calc lodevbasis5.1-ooofonts lodevbasis5.1-images lodevbasis5.1-filter-data lodevbasis5.1-draw lodevbasis5.1-base lodevbasis5.1-en-US-writer lodevbasis5.1-en-US-math lodevbasis5.1-en-US-base Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib fontconfig libbz2-1 libcairo2 libdrm2 libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 libgthread-2_0-0 liblzma5 libpcre1 libpixman-1-0 libpng16-16 libuuid1 libxml2-2 %{?systemd_requires} +PreReq: %{fillup_prereq} %define owner lool %define group lool @@ -46,13 +49,21 @@ env BUILDING_FROM_RPMBUILD=yes make check %install env BUILDING_FROM_RPMBUILD=yes make install DESTDIR=%{buildroot} +%__install -D -m 444 %{SOURCE1} %{buildroot}%{_unitdir}/loolwsd.service +install -d -m 755 %{buildroot}/var/adm/fillup-templates +install -D -m 644 %{SOURCE2} %{buildroot}/var/adm/fillup-templates %files /usr/bin/loolwsd /usr/bin/loolwsd-systemplate-setup +%{_unitdir}/loolwsd.service +/var/adm/fillup-templates/sysconfig.loolwsd %doc README +%pre +%service_add_pre loolwsd.service + %post setcap cap_fowner,cap_sys_chroot=ep /usr/bin/loolwsd @@ -73,6 +84,16 @@ chown %{owner} ${loolparent}/lool/child-roots su %{owner} -c "loolwsd-systemplate-setup ${loolparent}/lool/systemplate ${loroot} >/dev/null" +%service_add_post loolwsd.service + +%{fillup_only -n loolwsd} + +%preun +%service_del_preun loolwsd.service + +%postun +%service_del_postun loolwsd.service + %changelog * Tue May 19 2015 Tor Lillqvist - Initial RPM release diff --git a/loolwsd/sysconfig.loolwsd b/loolwsd/sysconfig.loolwsd new file mode 100644 index 0000000..f8e116c --- /dev/null +++ b/loolwsd/sysconfig.loolwsd @@ -0,0 +1,9 @@ +## Path: Network/Remote access/LOOLWSD +## Description: LibreOffice On-Line WebSocket Daemon settings +## Type: string +## Default: "" +## ServiceRestart: loolwsd +# +# Number of child processes to pre-spawn initially +# +LOOLWSD_NUMPRESPAWNS="5" commit bbf844f8dafe4f0055c6868856cf43d5ca4203cc Author: Tor Lillqvist <[email protected]> Date: Mon Jun 1 19:52:48 2015 +0300 Fix copy/paste error in help message diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp index eb47371..b2668cb 100644 --- a/loolwsd/LOOLWSD.cpp +++ b/loolwsd/LOOLWSD.cpp @@ -465,7 +465,7 @@ void LOOLWSD::defineOptions(OptionSet& options) options.addOption(Option("numprespawns", "", "Number of child processes to keep started in advance and waiting for new clients.") .required(false) .repeatable(false) - .argument("port number")); + .argument("number")); options.addOption(Option("test", "", "Interactive testing.") .required(false) commit a8bbebb4b2a39580c19c81992fbfcb6f5b9a19ad Author: Tor Lillqvist <[email protected]> Date: Mon Jun 1 18:32:04 2015 +0300 Drop more too specific dependencies diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in index 5f423dd..cec94dc 100644 --- a/loolwsd/loolwsd.spec.in +++ b/loolwsd/loolwsd.spec.in @@ -26,7 +26,7 @@ BuildRequires: libcap-progs libcap-devel libpng-devel poco-devel >= 1.6.0 # This works for now only with the TDF nightly builds of 5.0 or 5.1, I # think. But the TDF packages include the version number in their # names. How clever is that? So we need to specify one. -Requires: libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0 libPocoNet30 >= 1.6.0 libreofficedev5.1 libreofficedev5.1-en-US libreofficedev5.1-ure lodevbasis5.1-core lodevbasis5.1-writer lodevbasis5.1-impress lodevbasis5.1-graphicfilter lodevbasis5.1-en-US lodevbasis5.1-calc lodevbasis5.1-en-US-res lodevbasis5.1-en-US-calc lodevbasis5.1-ooofonts lodevbasis5.1-images lodevbasis5.1-filter-data lodevbasis5.1-draw lodevbasis5.1-base lodevbasis5.1-en-US-writer lodevbasis5.1-en-US-math lodevbasis5.1-en-US-base Mesa-libEGL1 Mesa-libGL1 libICE6 libSM6 libX11-xcb1 libX11-6 libXau6 libXdamage1 libXext6 libXfixes3 libXinerama1 libXrender1 libXxf86vm1 libbz2-1 libcairo2 cups-libs dbus-1-glib libdrm2 libexpat1 fontconfig libfreetype6 libgbm1 libgio-2_0-0 Mesa-libglapi0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 krb5 libgthread-2_0-0 krb5 krb5 krb5 liblzma5 libpcre1 libpixman-1-0 libpng16-16 libuuid1 libwayland-client0 libwayland-server0 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 lib xcb-present0 libxcb-render0 libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libxcb1 libxml2-2 libxshmfence1 +Requires: libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0 libPocoNet30 >= 1.6.0 libreofficedev5.1 libreofficedev5.1-en-US libreofficedev5.1-ure lodevbasis5.1-core lodevbasis5.1-writer lodevbasis5.1-impress lodevbasis5.1-graphicfilter lodevbasis5.1-en-US lodevbasis5.1-calc lodevbasis5.1-en-US-res lodevbasis5.1-en-US-calc lodevbasis5.1-ooofonts lodevbasis5.1-images lodevbasis5.1-filter-data lodevbasis5.1-draw lodevbasis5.1-base lodevbasis5.1-en-US-writer lodevbasis5.1-en-US-math lodevbasis5.1-en-US-base Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib fontconfig libbz2-1 libcairo2 libdrm2 libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 libgthread-2_0-0 liblzma5 libpcre1 libpixman-1-0 libpng16-16 libuuid1 libxml2-2 %{?systemd_requires} %define owner lool %define group lool _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
