From b7e012f886efa8ed49dce5a04411821384c348b3 Mon Sep 17 00:00:00 2001 From: Simon L Date: Sat, 25 Mar 2023 10:12:38 +0100 Subject: [PATCH 1/2] add dot to allowed characters in additional backup volumes Signed-off-by: Simon L --- php/src/Data/ConfigurationManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/src/Data/ConfigurationManager.php b/php/src/Data/ConfigurationManager.php index 1c257946..334bb7c9 100644 --- a/php/src/Data/ConfigurationManager.php +++ b/php/src/Data/ConfigurationManager.php @@ -664,7 +664,7 @@ class ConfigurationManager // Trim all unwanted chars on both sites $entry = trim($entry); if ($entry !== "") { - if (!preg_match("#^/[0-1a-zA-Z/-_]+$#", $entry) && !preg_match("#^[0-1a-zA-Z_-]+$#", $entry)) { + if (!preg_match("#^/[.0-1a-zA-Z/-_]+$#", $entry) && !preg_match("#^[.0-1a-zA-Z_-]+$#", $entry)) { throw new InvalidSettingConfigurationException("You entered unallowed characters! Problematic is " . $entry); } $validDirectories .= rtrim($entry, '/') . PHP_EOL; From 5d9573602b93b7fca53b2c597bbdd8429628b7d9 Mon Sep 17 00:00:00 2001 From: Simon L Date: Thu, 30 Mar 2023 15:32:25 +0200 Subject: [PATCH 2/2] also update the ui Signed-off-by: Simon L --- php/templates/containers.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/templates/containers.twig b/php/templates/containers.twig index 6684c455..99bf7de1 100644 --- a/php/templates/containers.twig +++ b/php/templates/containers.twig @@ -441,7 +441,7 @@
- Each line and entry needs to start with a slash or letter/digit. Allowed are only a-z, A-Z, 0-9, _, -, and /. If the entry begins with a letter/digit are slashes not supported. Two valid entries are /directory/on/the/host and my_custom_docker_volume. You need to make sure yourself that all given directories exist. Otherwise the backup container will fail starting!

+ Each line and entry needs to start with a slash or letter/digit. Allowed are only a-z, A-Z, ., 0-9, _, -, and /. If the entry begins with a letter/digit are slashes not supported. Two valid entries are /directory/on/the/host and my_custom_docker_volume. You need to make sure yourself that all given directories exist. Otherwise the backup container will fail starting!

Make sure to specify all storages that you want to back up separately since storages will not be mounted recursively. E.g. providing / as additional backup directory will only back up files and folders that are stored on the root partition and not on the EFI partition or any other. Excluded by the backup will be caches and a few other directories. You should make sure to stop all services before the backup can run correctly if you want to back up the root partition. For automating this see this documentation

Please note that the chosen directories/volumes will not be restored when you restore your instance, so this would need to be done manually.

{% if additional_backup_directories != "" %}