Skip to content

refactor: replace su-exec/gosu with setpriv #231

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xoxys merged 1 commit into from
Sep 20, 2022
Merged

refactor: replace su-exec/gosu with setpriv #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion latest/overlay/etc/owncloud.d/35-logging.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
if [[ ! -e ${OWNCLOUD_LOG_FILE} ]]; then
if [[ "$(id -u)" == "0" ]]; then
echo "Touching log file..."
su-exec www-data touch "${OWNCLOUD_LOG_FILE}"
setpriv --reuid=www-data --regid=www-data --init-groups touch "${OWNCLOUD_LOG_FILE}"
else
echo "Touching log file..."
touch "${OWNCLOUD_LOG_FILE}"
Expand Down
2 changes: 1 addition & 1 deletion latest/overlay/usr/bin/occ
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if [[ -z "${OWNCLOUD_ENTRYPOINT_INITIALIZED}" ]]; then
fi

if [[ "$(id -u)" == "0" ]]; then
su-exec www-data php /var/www/owncloud/occ "$@"
setpriv --reuid=www-data --regid=www-data --init-groups php /var/www/owncloud/occ "$@"
else
php /var/www/owncloud/occ "$@"
fi
2 changes: 1 addition & 1 deletion v20.04/overlay/etc/owncloud.d/35-logging.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
if [[ ! -e ${OWNCLOUD_LOG_FILE} ]]; then
if [[ "$(id -u)" == "0" ]]; then
echo "Touching log file..."
su-exec www-data touch "${OWNCLOUD_LOG_FILE}"
setpriv --reuid=www-data --regid=www-data --init-groups touch "${OWNCLOUD_LOG_FILE}"
else
echo "Touching log file..."
touch "${OWNCLOUD_LOG_FILE}"
Expand Down
2 changes: 1 addition & 1 deletion v20.04/overlay/usr/bin/occ
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if [[ -z "${OWNCLOUD_ENTRYPOINT_INITIALIZED}" ]]; then
fi

if [[ "$(id -u)" == "0" ]]; then
su-exec www-data php /var/www/owncloud/occ "$@"
setpriv --reuid=www-data --regid=www-data --init-groups php /var/www/owncloud/occ "$@"
else
php /var/www/owncloud/occ "$@"
fi