diff --git a/readme-vars.yml b/readme-vars.yml index a454c2a..8465926 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -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``." } 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 64cac34..8c16cd2 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 @@ -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}"; }