distro: more renames 'lool' -> 'cool'
Change-Id: I281270d36293bc16688f016ddcb2f3187aa03fea Signed-off-by: Henry Castro <hcastro@collabora.com>pull/3649/head
parent
7adb84e1c8
commit
f793eab2e3
|
@ -7,12 +7,12 @@ case "$1" in
|
|||
setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/coolforkit || true
|
||||
setcap cap_sys_admin=ep /usr/bin/loolmount || true
|
||||
|
||||
adduser --quiet --system --group --home /opt/lool lool
|
||||
adduser --quiet --system --group --home /opt/cool lool
|
||||
chown lool: /etc/loolwsd/loolwsd.xml
|
||||
chmod 640 /etc/loolwsd/loolwsd.xml
|
||||
|
||||
# We assume that the LibreOffice to be used is built TDF-style
|
||||
# and installs in @LO_PATH@, and that /opt/lool is
|
||||
# and installs in @LO_PATH@, and that /opt/cool is
|
||||
# on the same file system
|
||||
|
||||
rm -rf /opt/lool
|
||||
|
|
|
@ -13,7 +13,7 @@ Restart=always
|
|||
LimitNOFILE=infinity:infinity
|
||||
|
||||
ProtectSystem=strict
|
||||
ReadWritePaths=/opt/lool /var/log
|
||||
ReadWritePaths=/opt/cool /var/log
|
||||
|
||||
ProtectHome=yes
|
||||
PrivateTmp=yes
|
||||
|
|
|
@ -26,8 +26,8 @@ COPY /start-collabora-online.sh /
|
|||
# Fix permissions
|
||||
RUN setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/coolforkit && \
|
||||
setcap cap_sys_admin=ep /usr/bin/loolmount && \
|
||||
adduser --quiet --system --group --home /opt/lool lool && \
|
||||
rm -rf /opt/lool && \
|
||||
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 && \
|
||||
touch /var/log/loolwsd.log && \
|
||||
|
|
|
@ -27,7 +27,7 @@ COPY /start-collabora-online.sh /
|
|||
# Fix permissions
|
||||
RUN setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/coolforkit && \
|
||||
setcap cap_sys_admin=ep /usr/bin/loolmount && \
|
||||
adduser --quiet --system --group --home /opt/lool lool && \
|
||||
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 && \
|
||||
|
|
|
@ -21,9 +21,9 @@ COPY /start-collabora-online.sh /
|
|||
# Fix permissions
|
||||
RUN setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/coolforkit && \
|
||||
setcap cap_sys_admin=ep /usr/bin/loolmount && \
|
||||
groupadd -r lool && \
|
||||
useradd -g lool -r lool -d /opt/lool -s /bin/bash && \
|
||||
rm -rf /opt/lool && \
|
||||
groupadd -r cool && \
|
||||
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 && \
|
||||
touch /var/log/loolwsd.log && \
|
||||
|
|
|
@ -31,5 +31,5 @@
|
|||
ProxyPass /cool/adminws ws://127.0.0.1:9980/cool/adminws
|
||||
|
||||
# Download as, Fullscreen presentation and Image upload operations
|
||||
ProxyPass /lool http://127.0.0.1:9980/lool
|
||||
ProxyPassReverse /lool http://127.0.0.1:9980/lool
|
||||
ProxyPass /cool http://127.0.0.1:9980/cool
|
||||
ProxyPassReverse /cool http://127.0.0.1:9980/cool
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
}
|
||||
|
||||
# download, presentation and image upload
|
||||
location ~ ^/lool {
|
||||
location ~ ^/cool {
|
||||
proxy_pass http://localhost:9980;
|
||||
proxy_set_header Host $http_host;
|
||||
}
|
||||
|
|
|
@ -13,7 +13,7 @@ Restart=always
|
|||
LimitNOFILE=infinity:infinity
|
||||
|
||||
ProtectSystem=strict
|
||||
ReadWritePaths=/opt/lool /var/log
|
||||
ReadWritePaths=/opt/cool /var/log
|
||||
|
||||
ProtectHome=yes
|
||||
PrivateTmp=yes
|
||||
|
|
|
@ -147,8 +147,8 @@ echo "account required pam_unix.so" >> %{buildroot}/etc/pam.d/loolwsd
|
|||
%service_add_pre loolwsd.service
|
||||
%endif
|
||||
|
||||
getent group lool >/dev/null || groupadd -r lool
|
||||
getent passwd lool >/dev/null || useradd -g lool -r lool -d /opt/lool -s /bin/bash
|
||||
getent group cool >/dev/null || groupadd -r cool
|
||||
getent passwd cool >/dev/null || useradd -g cool -r cool -d /opt/cool -s /bin/bash
|
||||
|
||||
# for filename in `find /opt/cool/systemplate -type f`;do stripped=$(echo -ne $filename | sed -e "s|/opt/cool/systemplate||");rpm -qf --qf="%{NAME}\n" $stripped;done | grep -v devel | grep -v 32bit | grep -v -- -fonts | sort | uniq
|
||||
%triggerin -- expat fontconfig freetype freetype2 glibc glibc-locale kernel keyutils-libs krb5 krb5-libs libbz2-1 libcap libcap-ng libcap2 libexpat1 libfreetype6 libgcc libgcc_s1 libgcrypt libiscsi libpng libpng12 libpng12-0 libpng15-15 libpng16-16 libstdc++ libstdc++6 libuuid libuuid1 libz1 lsb nss-mdns nss-softokn-freebl pcre sssd sssd-client systemd-libs timezone tzdata zlib
|
||||
|
|
Loading…
Reference in New Issue