From d1c323e579cdf0cdfd8efbbfdbd104ada8be6822 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 26 Jun 2023 14:15:22 +0000 Subject: [PATCH] Set data directory during init Signed-off-by: GitHub --- .../s6-overlay/s6-rc.d/init-nextcloud-config/run | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run b/root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run index 642f3c3..3858593 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run @@ -36,11 +36,11 @@ for dir in apps config themes; do fi done -# symlink data folder -if [ "$(readlink /app/www/public/data)" != "/data" ]; then - rm -rf /app/www/public/data - ln -s /data /app/www/public/data - lsiown abc:abc /data /app/www/public/data +# set data directory +if [ -f /config/www/nextcloud/config/config.php ]; then + sed -i "s|/app/www/public/data|/data|g" /config/www/nextcloud/config/config.php +else + echo -e " '/data'];" >/config/www/nextcloud/config/config.php fi # get versions @@ -91,11 +91,12 @@ if [ -f /config/www/nextcloud/config/needs_migration ] || [ -f /tmp/needs_instal rsync -rlD --include "/${dir}" --exclude '/*' /app/www/src/ /config/www/nextcloud/ fi done - if [ -z "$(ls -A /app/www/public/data/ 2>/dev/null)" ]; then + if [ -z "$(ls -A /data/ 2>/dev/null)" ]; then rsync -rlD --include "/data" --exclude '/*' /app/www/src/ / fi echo "Setting permissions" + lsiown abc:abc /data lsiown abc:abc -R \ /app/www/public \ /config/www/nextcloud @@ -140,6 +141,9 @@ if occ config:system:get installed >/dev/null 2>&1; then if ! occ config:system:get memcache.locking >/dev/null 2>&1; then occ config:system:set memcache.locking --value='\\OC\\Memcache\\APCu' fi + if ! occ config:system:get datadirectory >/dev/null 2>&1; then + occ config:system:set datadirectory --value='/data' + fi else echo "After completing the web-based installer, restart the Nextcloud container to apply default memory caching and transactional file locking configurations." echo "Alternatively, you can apply your own configurations by editing /config/www/nextcloud/config/config.php following the documentation:"