From 81cb2a73892eca0dd7314b91f50c24767c3fb053 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Sat, 10 Oct 2015 11:04:32 +0530 Subject: [PATCH 1/2] entrypoint.sh: set `mail_room_enabled` to value of `GITLAB_INCOMING_EMAIL_ENABLED` so that `gitlab:check` does not complain --- entrypoint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/entrypoint.sh b/entrypoint.sh index ee4950c4..e1e6d6fb 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -564,6 +564,7 @@ if [[ ${SMTP_ENABLED} == true ]]; then fi # configure mail_room IMAP settings +echo "mail_room_enabled=${GITLAB_INCOMING_EMAIL_ENABLED}" >> /etc/default/gitlab sed 's/{{GITLAB_INCOMING_EMAIL_ENABLED}}/'"${GITLAB_INCOMING_EMAIL_ENABLED}"'/' -i /etc/supervisor/conf.d/mail_room.conf sudo -HEu ${GITLAB_USER} sed 's/{{GITLAB_INCOMING_EMAIL_ENABLED}}/'"${GITLAB_INCOMING_EMAIL_ENABLED}"'/' -i config/gitlab.yml sudo -HEu ${GITLAB_USER} sed 's/{{GITLAB_INCOMING_EMAIL_ADDRESS}}/'"${GITLAB_INCOMING_EMAIL_ADDRESS}"'/' -i config/gitlab.yml From 2516706e6322083f927f5d4b20aee1e186de8754 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Sat, 10 Oct 2015 11:04:39 +0530 Subject: [PATCH 2/2] entrypoint.sh: update permissions of `uploads/` Refer #456 --- entrypoint.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index e1e6d6fb..de80d21c 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -841,7 +841,7 @@ chown ${GITLAB_USER}:${GITLAB_USER} ${GITLAB_BACKUP_DIR} # create the uploads directory mkdir -p ${GITLAB_DATA_DIR}/uploads/ -chmod -R u+rwX ${GITLAB_DATA_DIR}/uploads/ +chmod 0750 ${GITLAB_DATA_DIR}/uploads/ chown ${GITLAB_USER}:${GITLAB_USER} ${GITLAB_DATA_DIR}/uploads/ # create the .ssh directory @@ -974,8 +974,10 @@ appSanitize () { chown -R ${GITLAB_USER}:${GITLAB_USER} ${GITLAB_BUILDS_DIR} echo "Checking uploads directory permissions..." - chmod -R u+rwX ${GITLAB_DATA_DIR}/uploads/ - chown ${GITLAB_USER}:${GITLAB_USER} -R ${GITLAB_DATA_DIR}/uploads/ + chmod -R 0750 ${GITLAB_DATA_DIR}/uploads/ + find ${GITLAB_DATA_DIR}/uploads -type f -exec chmod 0644 {} \; + find ${GITLAB_DATA_DIR}/uploads -type d -not -path ${GITLAB_DATA_DIR}/uploads -exec chmod 0755 {} \; + chown ${GITLAB_USER}:${GITLAB_USER} ${GITLAB_DATA_DIR}/uploads/ echo "Checking tmp directory permissions..." chmod -R u+rwX ${GITLAB_DATA_DIR}/tmp/