haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename: loolwsd-systemplate-setup -> coolwsd-systemplate-setup 

Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I699db87f94f9080909c2ca783e04ad8b4dd98025
pull/3664/head
Andras Timar 2021-11-17 22:09:50 +01:00
parent bf5bce7669
commit 504c05df3b
13 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.am
View File

@ -24,14 +24,14 @@ else
bin_PROGRAMS += coolwsd
endif
dist_bin_SCRIPTS = loolwsd-systemplate-setup \
dist_bin_SCRIPTS = coolwsd-systemplate-setup \
coolwsd-generate-proof-key
man_MANS = man/coolwsd.1 \
man/coolforkit.1 \
man/coolconvert.1 \
man/coolconfig.1 \
man/loolwsd-systemplate-setup.1 \
man/coolwsd-systemplate-setup.1 \
man/coolwsd-generate-proof-key.1 \
man/coolmount.1
@ -392,11 +392,11 @@ endif
# Build loolwsd and coolmount first, so we can cleanup before updating
# the systemplate directory, which we can't rm if it's mounted.
$(SYSTEM_STAMP): ${top_srcdir}/loolwsd-systemplate-setup $(CLEANUP_DEPS)
$(SYSTEM_STAMP): ${top_srcdir}/coolwsd-systemplate-setup $(CLEANUP_DEPS)
$(SET_CAPS_COMMAND)
$(CLEANUP_COMMAND)
if test "z@SYSTEMPLATE_PATH@" != "z"; then chmod u+w -R "@SYSTEMPLATE_PATH@" ; rm -rf "@SYSTEMPLATE_PATH@" && \
${top_srcdir}/loolwsd-systemplate-setup "@SYSTEMPLATE_PATH@" "@LO_PATH@" && touch $@; fi
${top_srcdir}/coolwsd-systemplate-setup "@SYSTEMPLATE_PATH@" "@LO_PATH@" && touch $@; fi
@JAILS_PATH@:
$(CLEANUP_COMMAND)
@ -591,4 +591,5 @@ browser/node_modules: browser/package.json browser/archived-packages
install-exec-hook:
cd $(DESTDIR)$(bindir) && \
$(LN_S) coolconfig loolconfig && \
$(LN_S) coolwsd loolwsd
$(LN_S) coolwsd loolwsd && \
$(LN_S) coolwsd-systemplate-setup loolwsd-systemplate-setup

4
debian/loolwsd.postinst.in vendored
View File

@ -22,11 +22,11 @@ case "$1" in
fc-cache @LO_PATH@/share/fonts/truetype
loolwsd-systemplate-setup /opt/cool/systemplate @LO_PATH@ >/dev/null 2>&1
coolwsd-systemplate-setup /opt/cool/systemplate @LO_PATH@ >/dev/null 2>&1
coolwsd-generate-proof-key >/dev/null 2>&1
cat << EOF > /etc/apt/apt.conf.d/25loolwsd
// Rebuild systemplate of @APP_NAME@
DPkg::Post-Invoke { "echo Updating loolwsd systemplate;loolwsd-systemplate-setup /opt/cool/systemplate @LO_PATH@ >/dev/null 2>&1 || true"; };
DPkg::Post-Invoke { "echo Updating loolwsd systemplate;coolwsd-systemplate-setup /opt/cool/systemplate @LO_PATH@ >/dev/null 2>&1 || true"; };
EOF
;;

2
docker/from-packages/scripts/install-collabora-online-rhel8.sh
View File

@ -7,7 +7,7 @@
# Install some more fonts (I did not find open-sans-fonts in RHEL repos)
# dnf install -y open-sans-fonts
# Install cpio (missing dependency needed by loolwsd-systemplate-setup)
# Install cpio (missing dependency needed by coolwsd-systemplate-setup)
dnf install -y cpio
# Install gnupg2

2
docker/from-source/Debian
View File

@ -29,7 +29,7 @@ RUN setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/coolforkit
adduser --quiet --system --group --home /opt/cool cool && \
rm -rf /opt/cool && \
mkdir -p /opt/cool/child-roots && \
loolwsd-systemplate-setup /opt/cool/systemplate /opt/lokit >/dev/null 2>&1 && \
coolwsd-systemplate-setup /opt/cool/systemplate /opt/lokit >/dev/null 2>&1 && \
touch /var/log/loolwsd.log && \
chown cool:cool /var/log/loolwsd.log && \
chown -R cool:cool /opt/ && \

2
docker/from-source/Ubuntu
View File

@ -30,7 +30,7 @@ RUN setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/coolforkit
adduser --quiet --system --group --home /opt/cool cool && \
rm -rf /opt/cool && \
mkdir -p /opt/cool/child-roots && \
loolwsd-systemplate-setup /opt/cool/systemplate /opt/lokit >/dev/null 2>&1 && \
coolwsd-systemplate-setup /opt/cool/systemplate /opt/lokit >/dev/null 2>&1 && \
touch /var/log/loolwsd.log && \
chown cool:cool /var/log/loolwsd.log && \
chown -R cool:cool /opt/ && \

2
docker/from-source/openSUSE
View File

@ -25,7 +25,7 @@ RUN setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/coolforkit
useradd -g cool -r cool -d /opt/cool -s /bin/bash && \
rm -rf /opt/cool && \
mkdir -p /opt/cool/child-roots && \
loolwsd-systemplate-setup /opt/cool/systemplate /opt/lokit >/dev/null 2>&1 && \
coolwsd-systemplate-setup /opt/cool/systemplate /opt/lokit >/dev/null 2>&1 && \
touch /var/log/loolwsd.log && \
chown cool:cool /var/log/loolwsd.log && \
chown -R cool:cool /opt/ && \

6
loolwsd.spec.in
View File

@ -99,7 +99,7 @@ echo "account required pam_unix.so" >> %{buildroot}/etc/pam.d/loolwsd
%files
%defattr(-,root,root,-)
/usr/bin/coolwsd
/usr/bin/loolwsd-systemplate-setup
/usr/bin/coolwsd-systemplate-setup
/usr/bin/coolwsd-generate-proof-key
/usr/bin/coolforkit
/usr/bin/coolconvert
@ -118,7 +118,7 @@ echo "account required pam_unix.so" >> %{buildroot}/etc/pam.d/loolwsd
/usr/share/man/man1/coolforkit.1.gz
/usr/share/man/man1/coolconvert.1.gz
/usr/share/man/man1/coolconfig.1.gz
/usr/share/man/man1/loolwsd-systemplate-setup.1.gz
/usr/share/man/man1/coolwsd-systemplate-setup.1.gz
/usr/share/man/man1/coolwsd-generate-proof-key.1.gz
/usr/share/man/man1/coolmount.1.gz
%{_unitdir}/loolwsd.service
@ -171,7 +171,7 @@ chown cool:cool ${loolparent}/cool
chown cool:cool ${loolparent}/cool/child-roots
fc-cache ${loroot}/share/fonts/truetype
loolwsd-systemplate-setup ${loolparent}/cool/systemplate ${loroot} >/dev/null 2>&1
coolwsd-systemplate-setup ${loolparent}/cool/systemplate ${loroot} >/dev/null 2>&1
coolwsd-generate-proof-key >/dev/null 2>&1
%if 0%{?rhel} || 0%{?suse_version}

2
man/coolconfig.1
View File

@ -31,4 +31,4 @@ update\-system\-template
The \fBanonymize\fR command helps to read anonymized logs. If you know a document and/or a user had an issue, you can find their session in the logs by running this command with the username and/or document name and get the anonymized hash, which you use to search the logs with.
.PP
.SH "SEE ALSO"
coolforkit(1), coolconvert(1), loolwsd(1), loolwsd-systemplate-setup(1), coolwsd-generate-proof-key(1), coolmount(1)
coolforkit(1), coolconvert(1), loolwsd(1), coolwsd-systemplate-setup(1), coolwsd-generate-proof-key(1), coolmount(1)

2
man/coolwsd-generate-proof-key.1
View File

@ -6,4 +6,4 @@ coolwsd-generate-proof-key
.SH DESCRIPTION
coolwsd-generate-proof-key creates an RSA key pair in /etc/loolwsd for the WOPI Proof headers. The script is automatically run by the postinstall script of loolwsd package, but in case of failure sysadmins can run it manually.
.SH "SEE ALSO"
coolforkit(1), coolconvert(1), coolconfig(1), loolwsd(1), loolwsd-systemplate-setup(1), coolmount(1)
coolforkit(1), coolconvert(1), coolconfig(1), loolwsd(1), coolwsd-systemplate-setup(1), coolmount(1)

8
man/loolwsd-systemplate-setup.1 → man/coolwsd-systemplate-setup.1
View File

@ -1,9 +1,9 @@
.TH LOOLWSD-SYSTEMPLATE-SETUP "1" "May 2018" "loolwsd-systemplate-setup " "User Commands"
.TH LOOLWSD-SYSTEMPLATE-SETUP "1" "May 2018" "coolwsd-systemplate-setup " "User Commands"
.SH NAME
loolwsd-systemplate-setup \- Utility that sets up system template for Collabora Online
coolwsd-systemplate-setup \- Utility that sets up system template for Collabora Online
.SH SYNOPSIS
loolwsd-systemplate-setup <chroot template directory for system libs to create> <LibreOffice installation directory>
coolwsd-systemplate-setup <chroot template directory for system libs to create> <LibreOffice installation directory>
.SH DESCRIPTION
loolwsd-systemplate-setup creates a minimal system template for running the LibreOfficeKit in a chroot jail. The system template contains the bare minimum of system libraries to run LibreOfficeKit, and also fonts and locale data from the system.
coolwsd-systemplate-setup creates a minimal system template for running the LibreOfficeKit in a chroot jail. The system template contains the bare minimum of system libraries to run LibreOfficeKit, and also fonts and locale data from the system.
.SH "SEE ALSO"
coolforkit(1), coolconvert(1), coolconfig(1), loolwsd(1), coolwsd-generate-proof-key(1), coolmount(1)

2
man/coolwsd.1
View File

@ -31,4 +31,4 @@ coolwsd OPTIONS
\fB\-\-nocaps\fR Use a non\-privileged forkit, with increase in security problems.
.PP
.SH "SEE ALSO"
coolforkit(1), coolconvert(1), coolconfig(1), loolwsd-systemplate-setup(1), coolwsd-generate-proof-key(1), coolmount(1)
coolforkit(1), coolconvert(1), coolconfig(1), coolwsd-systemplate-setup(1), coolwsd-generate-proof-key(1), coolmount(1)

2
tools/Config.cpp
View File

@ -362,7 +362,7 @@ int Config::main(const std::vector<std::string>& args)
}
else if (args[0] == "update-system-template")
{
const char command[] = "loolwsd-systemplate-setup /opt/cool/systemplate " LO_PATH " >/dev/null 2>&1";
const char command[] = "coolwsd-systemplate-setup /opt/cool/systemplate " LO_PATH " >/dev/null 2>&1";
std::cout << "Running the following command:" << std::endl
<< command << std::endl;

4
wsd/README
View File

@ -91,7 +91,7 @@ chroot system, and directory for the jails:
ROOTFORJAILS=`pwd`/jails # or tweak for your system
rm -Rf ${SYSTEMPLATE} # clean
./loolwsd-systemplate-setup ${SYSTEMPLATE} ${MASTER}/instdir # build template
./coolwsd-systemplate-setup ${SYSTEMPLATE} ${MASTER}/instdir # build template
mkdir -p ${ROOTFORJAILS} # create location for transient jails.
To run loolwsd the way it is supposed to eventually be run "for real", you can
@ -100,7 +100,7 @@ now do:
./loolwsd --o:sys_template_path=${SYSTEMPLATE} --o:child_root_path=${ROOTFORJAILS}
The ${SYSTEMPLATE} is a directory tree set up using the
loolwsd-systemplate-setup script here. (It should not exist before
coolwsd-systemplate-setup script here. (It should not exist before
running the script.) It will contain the runtime environment needed by
the LibreOffice dynamic libraries used through LibreOfficeKit.
Improvements to that script are very likely needed on various distros.