From 6e89841a15fd089d89035e489787b2d10a84efb7 Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Fri, 4 Jul 2025 13:10:40 +0900 Subject: [PATCH] base setup: www base folder must have www group set --- src/bin/base_setup.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/bin/base_setup.sh b/src/bin/base_setup.sh index 5c98566..4a8f222 100755 --- a/src/bin/base_setup.sh +++ b/src/bin/base_setup.sh @@ -48,8 +48,9 @@ CLONE_BASE="clone-base/" LOG_FOLDER="log/" SCRIPT_FOLDER="scripts/" CONFIG_FOLDER="config/" -WWW_WEBHOOK_INCOMING="/www/webhook-incoming"; -WWW_ADMIN="/www/admin"; +WWW_BASE="www/" +WWW_WEBHOOK_INCOMING="${WWW_BASE}webhook-incoming"; +WWW_ADMIN="${WWW_BASE}admin"; # jump host PEM file PEM_BASE="${BASE_FOLDER}../pem/"; @@ -126,8 +127,12 @@ EOF # setfacl -m u:"${SUDO_USER}":rwx -R "${GIT_WEBHOOK_BASE_FOLDER}${CLONE_BASE}" # setfacl -d -m u:"${SUDO_USER}":rwx -R "${GIT_WEBHOOK_BASE_FOLDER}${CLONE_BASE}" # web user must have access to the clone folder, RWX - setfacl -m g:"${WWW_GROUP}":rwx -R "${GIT_WEBHOOK_BASE_FOLDER}${CLONE_BASE}" - setfacl -d -m g:"${WWW_GROUP}":rwx -R "${GIT_WEBHOOK_BASE_FOLDER}${CLONE_BASE}" + setfacl -m g:"${WWW_GROUP}":rwx -R \ + "${GIT_WEBHOOK_BASE_FOLDER}${CLONE_BASE}" \ + "${GIT_WEBHOOK_BASE_FOLDER}${WWW_BASE}"; + setfacl -d -m g:"${WWW_GROUP}":rwx -R \ + "${GIT_WEBHOOK_BASE_FOLDER}${CLONE_BASE}" \ + "${GIT_WEBHOOK_BASE_FOLDER}${WWW_BASE}"; # Copy files echo "+ Copy basic script and config files"; # git_pull.sh, init.sh, new_clone.sh, webhook.default.cfg