[Libreoffice-commits] online.git: 2 commits - loolwsd/loolwsd.spec.in loolwsd/Makefile.am

[Andras Timar]

 loolwsd/Makefile.am     |    6 +++---
 loolwsd/loolwsd.spec.in |    5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit fb7de5df8e30e207090d55bc0f7ca9871df984b3
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Apr 19 11:42:41 2016 +0200

    we need key.pem for admin console in http-only case too

diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 90756a9..8e3f3eb 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -12,11 +12,11 @@ loolwsddata_DATA = discovery.xml
 
 loolwsdconfigdir = @LOOLWSD_CONFIGDIR@
 
-loolwsdconfig_DATA = loolwsd.xml
+loolwsdconfig_DATA = loolwsd.xml \
+                     etc/key.pem
 
 if ENABLE_SSL
-loolwsdconfig_DATA += etc/key.pem \
-                      etc/cert.pem \
+loolwsdconfig_DATA += etc/cert.pem \
                       etc/ca-chain.cert.pem
 endif
 
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index b2e105c..2ffafba 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -81,8 +81,8 @@ tar cf - . | (cd %{buildroot}/usr/share/loolwsd/loleaflet && tar xf -)
 
 %config(noreplace) /etc/cron.d/loolwsd.cron
 %config(noreplace) /etc/loolwsd/loolwsd.xml
-%if %{ssl_support} == "YES"
 %config(noreplace) %attr(400, %{owner}, %{owner}) /etc/loolwsd/key.pem
+%if %{ssl_support} == "YES"
 %config(noreplace) /etc/loolwsd/cert.pem
 %config(noreplace) /etc/loolwsd/ca-chain.cert.pem
 %endif
commit 4864fac25abdff6cf115a7b2124120966d9638de
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Apr 19 11:39:02 2016 +0200

    enable default admin/admin optionally (e.g. for CODE VM)

diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index c6bc17d..b2e105c 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -54,6 +54,9 @@ env BUILDING_FROM_RPMBUILD=yes make %{?_smp_mflags}
 
 %install
 env BUILDING_FROM_RPMBUILD=yes make install DESTDIR=%{buildroot}
+%if %{default_admin} == "YES"
+sed -i "s|ExecStart=/usr/bin/loolwsd --version --systemplate=/opt/lool/systemplate --lotemplate=/opt/collaboraoffice5.0 --childroot=/opt/lool/child-roots --numprespawns=5 --fileserverroot=/usr/share/loolwsd|ExecStart=/usr/bin/loolwsd --version --systemplate=/opt/lool/systemplate --lotemplate=/opt/collaboraoffice5.0 --childroot=/opt/lool/child-roots --numprespawns=5 --fileserverroot=/usr/share/loolwsd --admincreds=admin/admin|" loolwsd.service
+%endif
 %__install -D -m 444 loolwsd.service %{buildroot}%{_unitdir}/loolwsd.service
 install -d -m 755 %{buildroot}/var/adm/fillup-templates
 install -D -m 644 sysconfig.loolwsd %{buildroot}/var/adm/fillup-templates