Skip to content

Commit afbc737

Browse files
committed
Fix running Nextcloud as root in occ and occ-cron
1 parent 0096de3 commit afbc737

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/usr/local/bin/occ

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set -eu
1818
RUN_AS="$(stat -c %U /var/www/html/occ)"
1919
[ -n "$RUN_AS" ] && [ "$RUN_AS" != "UNKNOWN" ] || { echo "Unable to run \`occ\`: Failed to determine www-data user" >&2 ; exit 1 ; }
2020

21-
if [ "$(id -u)" = 0 ]; then
21+
if [ "$(id -u)" = 0 ] && [ "$(id -un)" != "$RUN_AS" ]; then
2222
exec su -p "$RUN_AS" -s /bin/sh -c 'exec php -d memory_limit=2G -f /var/www/html/occ -- "$@"' -- '/bin/sh' "$@"
2323
else
2424
exec php -d memory_limit=2G -f /var/www/html/occ -- "$@"

src/usr/local/bin/occ-cron

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ fi
2323
RUN_AS="$(stat -c %U /var/www/html/cron.php)"
2424
[ -n "$RUN_AS" ] && [ "$RUN_AS" != "UNKNOWN" ] || { echo "Unable to run \`occ-cron\`: Failed to determine www-data user" >&2 ; exit 1 ; }
2525

26-
if [ "$(id -u)" = 0 ]; then
26+
if [ "$(id -u)" = 0 ] && [ "$(id -un)" != "$RUN_AS" ]; then
2727
exec su -p "$RUN_AS" -s /bin/sh -c 'exec php -d memory_limit=2G -f /var/www/html/cron.php' -- '/bin/sh'
2828
else
2929
exec php -d memory_limit=2G -f /var/www/html/cron.php

0 commit comments

Comments
 (0)