Merge pull request #1513 from nextcloud/enh/noid/back-up-fts-volume

also back up the fulltextsearch volume
This commit is contained in:
Simon L 2022-12-15 12:08:48 +01:00 committed by GitHub
commit 28919e27f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions

View file

@ -66,7 +66,7 @@ if [ "$BORG_MODE" = backup ]; then
# Test that nothing is empty
for directory in "${VOLUME_DIRS[@]}"; do
if [ -z "$(ls -A "$directory")" ]; then
if [ -z "$(ls -A "$directory")" ] && [ "$directory" != "/nextcloud_aio_volumes/nextcloud_aio_elasticsearch" ]; then
echo "$directory is empty which is not allowed."
exit 1
fi
@ -258,13 +258,14 @@ if [ "$BORG_MODE" = restore ]; then
# Restore everything except the configuration file
if ! rsync --stats --archive --human-readable -vv --delete \
--exclude "nextcloud_aio_mastercontainer/session/"** \
--exclude "nextcloud_aio_apache/caddy/"** \
--exclude "nextcloud_aio_elasticsearch" \
--exclude "nextcloud_aio_mastercontainer/caddy/"** \
--exclude "nextcloud_aio_mastercontainer/certs/"** \
--exclude "nextcloud_aio_mastercontainer/data/configuration.json" \
--exclude "nextcloud_aio_mastercontainer/data/daily_backup_running" \
--exclude "nextcloud_aio_mastercontainer/data/session_date_file" \
--exclude "nextcloud_aio_mastercontainer/data/configuration.json" \
--exclude "nextcloud_aio_apache/caddy/"** \
--exclude "nextcloud_aio_mastercontainer/caddy/"** \
--exclude "nextcloud_aio_mastercontainer/session/"** \
/tmp/borg/nextcloud_aio_volumes/ /nextcloud_aio_volumes; then
echo "Something failed while restoring from backup."
umount /tmp/borg

View file

@ -290,6 +290,11 @@
"name": "%BORGBACKUP_HOST_LOCATION%",
"location": "/mnt/borgbackup",
"writeable": true
},
{
"name": "nextcloud_aio_elasticsearch",
"location": "/nextcloud_aio_volumes/nextcloud_aio_elasticsearch",
"writeable": true
}
],
"secrets": [