Merge branch 'backup-g-c-o' into next

5 files changed, 40 insertions, 4 deletions

diff --git a/backup-email b/backup-email
index 158e746..50c5ce5 100644
--- a/backup-email
+++ b/backup-email
@@ -16,6 +16,7 @@
 :global BackupRandomDelay;
 :global BackupSendBinary;
 :global BackupSendExport;
+:global BackupSendGlobalConfig;
 :global Domain;
 :global Identity;
 
@@ -50,6 +51,7 @@ $WaitFullyConnected;
 :local FileName [ $CharacterReplace ($Identity . "." . $Domain) "." "_" ];
 :local FilePath ($DirName . "/" . $FileName);
 :local BackupFile "none";
+:local ExportFile "none";
 :local ConfigFile "none";
 :local Attach ({});
 
@@ -69,10 +71,19 @@ $WaitFullyConnected;
 :if ($BackupSendExport = true) do={
   /export terse show-sensitive file=$FilePath;
   $WaitForFile ($FilePath . ".rsc");
-  :set ConfigFile ($FileName . ".rsc");
+  :set ExportFile ($FileName . ".rsc");
   :set Attach ($Attach, ($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 ];
+  :set ConfigFile ($FileName . ".conf.txt");
+  :set Attach ($Attach, ($FilePath . ".conf.txt"));
+}
+
 # send email with status and files
 $SendEMail2 ({ origin=$0; \
   subject=([ $SymbolForNotification "floppy-disk,incoming-envelope" ] . \
@@ -81,6 +92,7 @@ $SendEMail2 ({ origin=$0; \
     $Identity . ".\n\n" . \
     [ $DeviceInfo ] . "\n\n" . \
     "Backup file:    " . $BackupFile . "\n" . \
+    "Export file:    " . $ExportFile . "\n" . \
     "Config file:    " . $ConfigFile); \
   attach=$Attach; remove-attach=true });
 
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={
diff --git a/global-config b/global-config
index 6096f14..c65e2f0 100644
--- a/global-config
+++ b/global-config
@@ -72,6 +72,7 @@
 # This defines what backups to generate and what password to use.
 :global BackupSendBinary false;
 :global BackupSendExport true;
+:global BackupSendGlobalConfig true;
 :global BackupPassword "v3ry-s3cr3t";
 :global BackupRandomDelay 0;
 # These credentials are used to upload backup and config export files.
diff --git a/global-config.changes b/global-config.changes
index 33a340e..dd40f09 100644
--- a/global-config.changes
+++ b/global-config.changes
@@ -101,6 +101,7 @@
   90="Chat with your router! Introduced 'telegram-chat' to chat via Telegram bot and send commands to your router.";
   91="Dropped check for CAP in 'check-routeros-update' to solve issues with wifiwave2 package.";
   92="Made qr-code url configurable for 'daily-psk'.";
+  93="Added support to backup global-config-overlay in 'backup-email' and 'backup-upload'.";
 };
 
 # Migration steps to be applied on script updates
diff --git a/global-functions b/global-functions
index d2f911e..63ec636 100644
--- a/global-functions
+++ b/global-functions
@@ -12,7 +12,7 @@
 :local 0 "global-functions";
 
 # expected configuration version
-:global ExpectedConfigVersion 92;
+:global ExpectedConfigVersion 93;
 
 # global variables not to be changed by user
 :global GlobalFunctionsReady false;