From fc2e4b65656fb39c67a354b0f15826f366a1206c Mon Sep 17 00:00:00 2001 From: Jan Klepek Date: Sat, 4 Jan 2025 21:12:53 +0100 Subject: [PATCH 1/3] return true even when chmod fails --- .../s6-overlay/s6-rc.d/init-permissions/run | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-permissions/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-permissions/run b/root/etc/s6-overlay/s6-rc.d/init-permissions/run new file mode 100644 index 0000000..3fff167 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-permissions/run @@ -0,0 +1,30 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +if [[ -z ${LSIO_READ_ONLY_FS} ]] && [[ -z ${LSIO_NON_ROOT_USER} ]]; then + # permissions + lsiown -R abc:abc \ + /var/lib/nginx + + chmod -R 644 /etc/logrotate.d +fi + +if [[ -z ${LSIO_NON_ROOT_USER} ]]; then + lsiown -R abc:abc \ + /config/keys \ + /config/log \ + /config/nginx \ + /config/php + + lsiown abc:abc \ + /config/www +fi + +if [[ -f "/config/log/logrotate.status" ]]; then + chmod 600 /config/log/logrotate.status +fi + +chmod -R g+w \ + /config/nginx + +true From 580425377e1ad657be90a0fc68da72d125888b10 Mon Sep 17 00:00:00 2001 From: Jan Klepek Date: Sat, 4 Jan 2025 21:41:28 +0100 Subject: [PATCH 2/3] set exec permission --- root/etc/s6-overlay/s6-rc.d/init-permissions/run | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 root/etc/s6-overlay/s6-rc.d/init-permissions/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-permissions/run b/root/etc/s6-overlay/s6-rc.d/init-permissions/run old mode 100644 new mode 100755 From 72c634af627d80caefdbc6f9f78a13a483fda5d9 Mon Sep 17 00:00:00 2001 From: Jan Klepek Date: Sat, 4 Jan 2025 21:57:37 +0100 Subject: [PATCH 3/3] Update readme-vars.yml describe changes for 04.01.25 --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index 5f0a69e..a112340 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -133,6 +133,7 @@ init_diagram: | "bookstack:latest" <- Base Images # changelog changelogs: + - {date: "04.01.25:", desc: "Adjust init-permissions to support qnap"} - {date: "17.12.24:", desc: "Rebase to Alpine 3.21."} - {date: "11.10.24:", desc: "Default to environment config over .env file config."} - {date: "06.09.24:", desc: "Add php-exif for reading image EXIF data."}