From cf6e42004f5f5281f3e806eef0659303f1c4d30b Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@thegeeklab.de>
Date: Tue, 20 Sep 2022 14:41:20 +0200
Subject: [PATCH] refactor: replace su-exec/gosu with setpriv

---
 latest/overlay/etc/owncloud.d/35-logging.sh | 2 +-
 latest/overlay/usr/bin/occ                  | 2 +-
 v20.04/overlay/etc/owncloud.d/35-logging.sh | 2 +-
 v20.04/overlay/usr/bin/occ                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/latest/overlay/etc/owncloud.d/35-logging.sh b/latest/overlay/etc/owncloud.d/35-logging.sh
index 4a6d4263..5666f916 100755
--- a/latest/overlay/etc/owncloud.d/35-logging.sh
+++ b/latest/overlay/etc/owncloud.d/35-logging.sh
@@ -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}"
diff --git a/latest/overlay/usr/bin/occ b/latest/overlay/usr/bin/occ
index 9390c9fc..8d921046 100755
--- a/latest/overlay/usr/bin/occ
+++ b/latest/overlay/usr/bin/occ
@@ -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
diff --git a/v20.04/overlay/etc/owncloud.d/35-logging.sh b/v20.04/overlay/etc/owncloud.d/35-logging.sh
index 4a6d4263..5666f916 100755
--- a/v20.04/overlay/etc/owncloud.d/35-logging.sh
+++ b/v20.04/overlay/etc/owncloud.d/35-logging.sh
@@ -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}"
diff --git a/v20.04/overlay/usr/bin/occ b/v20.04/overlay/usr/bin/occ
index 9390c9fc..8d921046 100755
--- a/v20.04/overlay/usr/bin/occ
+++ b/v20.04/overlay/usr/bin/occ
@@ -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