diff --git a/nextcloud/CHANGELOG.md b/nextcloud/CHANGELOG.md index 856ac0e3a..24ebc294c 100644 --- a/nextcloud/CHANGELOG.md +++ b/nextcloud/CHANGELOG.md @@ -1,5 +1,5 @@ - Use /addon_configs for config.yaml and nextcloud-ocr.sh to backup them with nextcloud -- Use /config/data as default folder instead of /share/nextcloud for initial set-up +- Use /config/data as default folder instead of /config/data for initial set-up ## 30.0.2 (09-11-2024) - Update to latest version from linuxserver/docker-nextcloud (changelog : https://github.com/linuxserver/docker-nextcloud/releases) @@ -342,7 +342,7 @@ - Repaired increment of trusted domains - Repaired setting OCR language - New optional config : enable elasticsearch (requires to run in parallel elasticsearch addon) -- Repaired default data setting in /share/nextcloud +- Repaired default data setting in /config/data ## 22.2.0 (02-10-2021) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index eecfbeb2d..4e0fbac14 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -31,7 +31,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ S6_SERVICES_GRACETIME=0 # Specific modifications -ARG CONFIGLOCATION="/share/nextcloud" +ARG CONFIGLOCATION="/config/data" # hadolint ignore=SC2015,SC2086 RUN \ # Change default data location diff --git a/nextcloud/README.md b/nextcloud/README.md index 1e37ba45c..d36df8f4e 100644 --- a/nextcloud/README.md +++ b/nextcloud/README.md @@ -65,7 +65,7 @@ PGID/PUID: 1000 #allows setting user. trusted_domains: your-domain.com #allows to select the trusted domains. Domains not in this lis will be removed, except for the first one used in the initial configuration. OCR: false #set to true to install tesseract-ocr capability. OCRLANG: fra,eng #Any language can be set from this page (always three letters) [here](https://tesseract-ocr.github.io/tessdoc/Data-Files#data-files-for-version-400-november-29-2016). -data_directory: path for the main data directory. Defaults to `/share/nextcloud`. Only used to set permissions and prefill the initial installation template. Once initial installation is done it can't be changed +data_directory: path for the main data directory. Defaults to `/config/data`. Only used to set permissions and prefill the initial installation template. Once initial installation is done it can't be changed enable_thumbnails: true/false # enable generations of thumbnails for media file (to disable for older systems) use_own_certs: true/false #if true, use the certfile and keyfile specified certfile: fullchain.pem #ssl certificate, must be located in /ssl diff --git a/nextcloud/rootfs/etc/cont-init.d/01-folders.sh b/nextcloud/rootfs/etc/cont-init.d/01-folders.sh index dd15174bb..e4422817a 100755 --- a/nextcloud/rootfs/etc/cont-init.d/01-folders.sh +++ b/nextcloud/rootfs/etc/cont-init.d/01-folders.sh @@ -21,7 +21,7 @@ if [ -f /data/config/www/nextcloud/config/config.php ]; then datadirectory="$(sed -n "s|.*datadirectory.*' => '*\(.*[^ ]\) *',.*|\1|p" /data/config/www/nextcloud/config/config.php)" echo "... data directory detected : $datadirectory" else - datadirectory=/share/nextcloud + datadirectory=/config/data echo "Nextcloud is not installed yet, the default data directory is : $datadirectory. You can change it during nextcloud installation." fi