misc: more renames 'lool' -> 'cool'

Change-Id: I2b4f9a1ee9e2560265af1a9cd78b774bb42c4d40
Signed-off-by: Henry Castro <hcastro@collabora.com>
This commit is contained in:
Henry Castro 2021-11-15 12:04:57 -04:00 committed by Andras Timar
parent 28be4a7936
commit c9e8ef69be
12 changed files with 27 additions and 27 deletions

View file

@ -15,17 +15,17 @@ task:
- tar -xzf LibreOfficeKit-includes-co-2021.tar.gz
build_script:
- mkdir .git/hooks
- pw useradd -n lool -d /tmp/loolhome -m
- pw useradd -n cool -d /tmp/loolhome -m
- chmod -R o+rwx ./
- su -m lool -c './autogen.sh'
- 'su -m lool -c ''env HOME=/tmp/loolhome MAKE=gmake
- su -m cool -c './autogen.sh'
- 'su -m cool -c ''env HOME=/tmp/loolhome MAKE=gmake
CPPFLAGS="-isystem /usr/local/include" CFLAGS="-I/usr/local/include"
CXXFLAGS="-I/usr/local/include" LDFLAGS=-L/usr/local/lib ./configure
--with-lo-path=/usr/local/lib/libreoffice/
--with-lokit-path=./libreoffice-src/include
--disable-seccomp --disable-setcap --enable-debug'' '
- su -m lool -c 'env HOME=/tmp/loolhome gmake -j`sysctl -n hw.ncpu`'
- su -m cool -c 'env HOME=/tmp/loolhome gmake -j`sysctl -n hw.ncpu`'
- chown root ./loolmount
- chmod +s ./loolmount
test_script:
# - su -m lool -c 'env HOME=/tmp/loolhome gmake check'
# - su -m cool -c 'env HOME=/tmp/loolhome gmake check'

View file

@ -37,7 +37,7 @@ ADD /scripts/start-collabora-online.sh /
EXPOSE 9980
# switch to lool user (use numeric user id to be compatible with Kubernetes Pod Security Policies)
# switch to cool user (use numeric user id to be compatible with Kubernetes Pod Security Policies)
USER 998
# Entry point

View file

@ -37,7 +37,7 @@ ADD /scripts/start-collabora-online.sh /
EXPOSE 9980
# switch to lool user (use numeric user id to be compatible with Kubernetes Pod Security Policies)
# switch to cool user (use numeric user id to be compatible with Kubernetes Pod Security Policies)
USER 104
# Entry point

View file

@ -63,7 +63,7 @@ dnf clean all
rm -rf /etc/loolwsd/proof_key*
# Fix permissions
# cf. start-collabora-online.sh that is run by lool user
# cf. start-collabora-online.sh that is run by cool user
# # Fix domain name resolution from jails
# cp /etc/resolv.conf /etc/hosts /opt/cool/systemplate/etc/
chown cool:cool /opt/cool/systemplate/etc/hosts /opt/cool/systemplate/etc/resolv.conf

View file

@ -78,7 +78,7 @@ rm -rf /var/lib/apt/lists/*
rm -rf /etc/loolwsd/proof_key*
# Fix permissions
# cf. start-collabora-online.sh that is run by lool user
# cf. start-collabora-online.sh that is run by cool user
# # Fix domain name resolution from jails
# cp /etc/resolv.conf /etc/hosts /opt/cool/systemplate/etc/
chown cool:cool /opt/cool/systemplate/etc/hosts /opt/cool/systemplate/etc/resolv.conf

View file

@ -31,13 +31,13 @@ RUN setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/coolforkit
mkdir -p /opt/cool/child-roots && \
loolwsd-systemplate-setup /opt/cool/systemplate /opt/lokit >/dev/null 2>&1 && \
touch /var/log/loolwsd.log && \
chown lool:lool /var/log/loolwsd.log && \
chown -R lool:lool /opt/ && \
chown -R lool:lool /etc/loolwsd
chown cool:cool /var/log/loolwsd.log && \
chown -R cool:cool /opt/ && \
chown -R cool:cool /etc/loolwsd
EXPOSE 9980
# switch to lool user (use numeric user id to be compatible with Kubernetes Pod Security Policies)
# switch to cool user (use numeric user id to be compatible with Kubernetes Pod Security Policies)
USER 101
CMD ["/start-collabora-online.sh"]

View file

@ -32,13 +32,13 @@ RUN setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/coolforkit
mkdir -p /opt/cool/child-roots && \
loolwsd-systemplate-setup /opt/cool/systemplate /opt/lokit >/dev/null 2>&1 && \
touch /var/log/loolwsd.log && \
chown lool:lool /var/log/loolwsd.log && \
chown -R lool:lool /opt/ && \
chown -R lool:lool /etc/loolwsd
chown cool:cool /var/log/loolwsd.log && \
chown -R cool:cool /opt/ && \
chown -R cool:cool /etc/loolwsd
EXPOSE 9980
# switch to lool user (use numeric user id to be compatible with Kubernetes Pod Security Policies)
# switch to cool user (use numeric user id to be compatible with Kubernetes Pod Security Policies)
USER 101
CMD ["/start-collabora-online.sh"]

View file

@ -27,13 +27,13 @@ RUN setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/coolforkit
mkdir -p /opt/cool/child-roots && \
loolwsd-systemplate-setup /opt/cool/systemplate /opt/lokit >/dev/null 2>&1 && \
touch /var/log/loolwsd.log && \
chown lool:lool /var/log/loolwsd.log && \
chown -R lool:lool /opt/ && \
chown -R lool:lool /etc/loolwsd
chown cool:cool /var/log/loolwsd.log && \
chown -R cool:cool /opt/ && \
chown -R cool:cool /etc/loolwsd
EXPOSE 9980
# switch to lool user (use numeric user id to be compatible with Kubernetes Pod Security Policies)
# switch to cool user (use numeric user id to be compatible with Kubernetes Pod Security Policies)
USER 481
CMD ["/start-collabora-online.sh"]

View file

@ -22,10 +22,10 @@ if hash ssh-keygen 2>/dev/null; then
if [ $? -ne 0 ] ; then
exit $?
fi
if id -u lool >/dev/null 2>&1; then
if id -u cool >/dev/null 2>&1; then
$SUDO chown lool: /etc/loolwsd/proof_key
else
echo "User lool does not exist. Please reinstall loolwsd package, or in case of manual installation from source, create the lool user manually."
echo "User lool does not exist. Please reinstall loolwsd package, or in case of manual installation from source, create the cool user manually."
fi
else
echo "ssh-keygen command not found. Please install openssh client tools."

View file

@ -10,7 +10,7 @@
# Start the service loolwsd
start() {
echo -n $"Starting loolwsd server: "
su lool -c "/usr/bin/loolwsd --version --o:logging.file[@enable]=true" &
su cool -c "/usr/bin/loolwsd --version --o:logging.file[@enable]=true" &
### Create the lock file ###
touch /var/lock/subsys/loolwsd
success $"loolwsd server startup"

View file

@ -167,8 +167,8 @@ loolparent=`cd ${loroot} && cd .. && /bin/pwd`
rm -rf ${loolparent}/cool
mkdir -p ${loolparent}/cool/child-roots
chown lool:lool ${loolparent}/cool
chown lool:lool ${loolparent}/cool/child-roots
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

View file

@ -12,7 +12,7 @@ loolconvert OPTIONS FILE(S)
.PP
\fB\-\-parallelism\fR=\fIthreads\fR number of simultaneous threads to use
.PP
\fB\-\-server\fR=\fIuri\fR URI of LOOL server
\fB\-\-server\fR=\fIuri\fR URI of COOL server
.PP
\fB\-\-no\-check\-certificate\fR Disable checking of SSL certs
.PP