From b914cfdf0b4eb1c67f493eb82115dde85657acd6 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Wed, 7 Jun 2023 09:53:52 -0500 Subject: [PATCH] Don't copy defaults The install and symlink handles this Signed-off-by: Eric Nemchik --- root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run | 8 ++------ 1 file changed, 2 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 a434c40..7c5bbeb 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 @@ -35,14 +35,10 @@ for dir in config custom_apps themes; do fi done -# copy defaults -cp -n /defaults/config.php /app/www/public/config/config.php 2> >(grep -v 'cp: not replacing') -datadirectory=$(php -r "require '/app/www/public/config/config.php'; echo \$CONFIG['datadirectory'];" 2>/dev/null) - # symlink data folder -if [ "$(readlink /app/www/public/data)" != "${datadirectory}" ]; then +if [ "$(readlink /app/www/public/data)" != "/data" ]; then rm -rf /app/www/public/data - ln -s "${datadirectory}" /app/www/public/data + ln -s /data /app/www/public/data fi # initialize version variables