aboutsummaryrefslogtreecommitdiffstats
path: root/backup-upload
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2023-02-07 20:34:35 +0100
committerGravatar Christian Hesse <mail@eworm.de>2023-02-07 21:19:57 +0100
commit5d263ca11eac4305ba9ae8b70742e9bc66fb6bf0 (patch)
tree82767bf093d1863cee207ffc7883f7aa1faa9725 /backup-upload
parent0527503c8e357e7cff99231b3cce2c153c9d6132 (diff)
backup-upload: support uploading global-config-overlay
Diffstat (limited to 'backup-upload')
-rw-r--r--backup-upload26
1 files changed, 24 insertions, 2 deletions
diff --git a/backup-upload b/backup-upload
index ee7b867..4fe9535 100644
--- a/backup-upload
+++ b/backup-upload
@@ -16,6 +16,7 @@
:global BackupRandomDelay;
:global BackupSendBinary;
:global BackupSendExport;
+:global BackupSendGlobalConfig;
:global BackupUploadPass;
:global BackupUploadUrl;
:global BackupUploadUser;
@@ -50,6 +51,7 @@ $WaitFullyConnected;
:local FileName [ $CharacterReplace ($Identity . "." . $Domain) "." "_" ];
:local FilePath ($DirName . "/" . $FileName);
:local BackupFile "none";
+:local ExportFile "none";
:local ConfigFile "none";
:local Failed 0;
@@ -83,16 +85,35 @@ $WaitFullyConnected;
:do {
/tool/fetch upload=yes url=($BackupUploadUrl . "/" . $FileName . ".rsc") \
user=$BackupUploadUser password=$BackupUploadPass src-path=($FilePath . ".rsc");
- :set ConfigFile ($FileName . ".rsc");
+ :set ExportFile ($FileName . ".rsc");
} on-error={
$LogPrintExit2 error $0 ("Uploading configuration export failed!") false;
- :set ConfigFile "failed";
+ :set ExportFile "failed";
:set Failed 1;
}
/file/remove ($FilePath . ".rsc");
}
+# global-config-overlay
+:if ($BackupSendGlobalConfig = true) do={
+ :execute script={ / } file=($FilePath . ".conf");
+ $WaitForFile ($FilePath . ".conf.txt");
+ /file/set ($FilePath . ".conf.txt") contents=[ /system/script/get global-config-overlay source ];
+
+ :do {
+ /tool/fetch upload=yes url=($BackupUploadUrl . "/" . $FileName . ".conf") \
+ user=$BackupUploadUser password=$BackupUploadPass src-path=($FilePath . ".conf.txt");
+ :set ConfigFile ($FileName . ".conf");
+ } on-error={
+ $LogPrintExit2 error $0 ("Uploading global-config-overlay failed!") false;
+ :set ConfigFile "failed";
+ :set Failed 1;
+ }
+
+ /file/remove ($FilePath . ".conf.txt");
+}
+
$SendNotification2 ({ origin=$0; \
subject=[ $IfThenElse ($Failed > 0) \
([ $SymbolForNotification "floppy-disk,warning-sign" ] . "Backup & Config upload with failure") \
@@ -100,6 +121,7 @@ $SendNotification2 ({ origin=$0; \
message=("Backup and config export upload for " . $Identity . ".\n\n" . \
[ $DeviceInfo ] . "\n\n" . \
"Backup file: " . $BackupFile . "\n" . \
+ "Export file: " . $ExportFile . "\n" . \
"Config file: " . $ConfigFile); silent=true });
:if ($Failed = 1) do={