LAB-linuxserver/docker-nextcloud
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-nextcloud.git synced 2026-04-27 00:00:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rearrange init order again

Browse Source 
Symlink user folders before reading datadirectory
Symlink datadirectory separately

Signed-off-by: Eric Nemchik <eric@nemchik.com>
This commit is contained in:
Eric Nemchik 2023-06-06 18:45:12 -05:00
parent 2924be9081
commit 7cc124486a
No known key found for this signature in database
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
readme-vars.yml
View File

@ -68,7 +68,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "06.06.23:", desc: "Move Nextcloud installation inside container." }
- { date: "06.06.23:", desc: "Move Nextcloud installation inside container. Remove CLI updater." }
- { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
- { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
- { date: "21.03.23:", desc: "Add php81-sysvsem as new dep for v26. Update default X-Robots-Tag to `noindex, nofollow``." }

23
root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run
View File

@ -24,21 +24,10 @@ if [ -f /config/www/nextcloud/version.php ]; then
! -path "/config/www/nextcloud/custom_apps" \
! -path "/config/www/nextcloud/themes" \
-delete
touch /tmp/full_chown
fi
# copy defaults
if [[ ! -f /app/www/public/config/config.php ]]; then
cp /defaults/config.php /app/www/public/config/config.php
fi
datadirectory=$(php -r "require '/app/www/public/config/config.php'; echo \$CONFIG['datadirectory'];")
# symlink folders
if [ "$(readlink /app/www/public/data)" != "${datadirectory}" ]; then
rm -rf /app/www/public/data
ln -s "${datadirectory}" /app/www/public/data
fi
# symlink config folders
for dir in config custom_apps themes; do
if [ "$(readlink /app/www/public/${dir})" != "/config/www/nextcloud/${dir}" ]; then
rm -rf "/app/www/public/${dir}"
@ -46,6 +35,16 @@ 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
rm -rf /app/www/public/data
ln -s "${datadirectory}" /app/www/public/data
fi
# install app
vergte() { printf '%s\n%s' "${2}" "${1}" | sort -C -V; }
vergt() { ! vergte "${2}" "${1}"; }