backup: split off cloud-backupchange-5

Currently backup to MikroTik cloud is pretty unreliable and script can
not catch errors at runtime. Looks like this does not change any time
soon (Ticket#2019052022003204).

So let's just split off the cloud backup to make sure email backup works
as expected.

5 files changed, 61 insertions, 44 deletions

diff --git a/cloud-backup b/cloud-backup
new file mode 100644
index 0000000..f9e7747
--- /dev/null
+++ b/cloud-backup
@@ -0,0 +1,42 @@
+#!rsc
+# RouterOS script: cloud-backup
+# Copyright (c) 2013-2019 Christian Hesse <mail@eworm.de>
+#
+# upload backup to MikroTik cloud
+
+:global Identity;
+:global BackupPassword;
+
+:global SendNotification;
+
+# get some system information
+:local BoardName [ / system resource get board-name ];
+:local Model [ / system routerboard get model ];
+:local SerialNumber [ / system routerboard get serial-number ];
+:local Channel [ / system package update get channel ];
+:local InstalledVersion [ / system package update get installed-version ];
+
+:do {
+  # we are not interested in output, but print without count-only is
+  # required to fetch information from cloud
+  / system backup cloud print as-value;
+  :if ([ / system backup cloud print count-only ] > 0) do={
+    / system backup cloud remove-file ([ find ]->0);
+  }
+  / system backup cloud upload-file action=create-and-upload password=$BackupPassword;
+  :local Cloud [ / system backup cloud get ([ find ]->0) ];
+
+  $SendNotification "Cloud backup" \
+    ("Uploaded backup for " . $Identity . " to cloud.\n\n" . \
+      "Board name:     " . $BoardName . "\n" . \
+      "Model:          " . $Model . "\n" . \
+      "Serial number:  " . $SerialNumber . "\n" . \
+      "Hostname:       " . $Identity . "\n" . \
+      "Channel:        " . $Channel . "\n" . \
+      "RouterOS:       " . $InstalledVersion . "\n\n" . \
+      "Name:           " . $Cloud->"name" . "\n" . \
+      "Size:           " . $Cloud->"size" . "\n" . \
+      "Download key:   " . $Cloud->"secret-download-key");
+} on-error={
+  :log error ("Failed uploading backup for " . $Identity . " to cloud.");
+}
diff --git a/email-backup b/email-backup
index 5fe4684..3050afc 100644
--- a/email-backup
+++ b/email-backup
@@ -10,21 +10,18 @@
 :global EmailBackupCc;
 :global BackupSendBinary;
 :global BackupSendExport;
-:global BackupCloud;
 :global BackupPassword;
 
 :if ($BackupSendBinary != true && \
-     $BackupSendExport != true && \
-     $BackupCloud != true) do={
+     $BackupSendExport != true) do={
   :log error ("Configured to send neither backup nor config export.");
   :error "Error: See log for details.";
 }
 
 # filename based on identity
 :local FileName ($Identity . "." . $Domain);
-:local CloudStatus $BackupCloud;
-:local BackupStatus $BackupSendBinary;
-:local ConfigStatus $BackupSendExport;
+:local BackupFile "none";
+:local ConfigFile "none";
 :local Attach [ :toarray "" ];
 
 # get some system information
@@ -35,52 +32,30 @@
 :local InstalledVersion [ / system package update get installed-version ];
 
 # binary backup
-:if ($BackupSendBinary = true || \
-     $BackupCloud = true) do={
+:if ($BackupSendBinary = true) do={
   / system backup save encryption=aes-sha256 name=$FileName password=$BackupPassword;
-
-  # attach to mail
-  :if ($BackupSendBinary = true) do={
-    :set BackupStatus ($FileName . ".backup");
-    :set Attach ($Attach, $BackupStatus);
-  }
-
-  # upload to cloud
-  :if ($BackupCloud = true) do={
-    :do {
-      # we are not interested in output, but print without count-only is
-      # required to fetch information from cloud
-      / system backup cloud print as-value;
-      :if ([ / system backup cloud print count-only ] > 0) do={
-        / system backup cloud remove-file ([ find ]->0);
-      }
-      / system backup cloud upload-file action=upload src-file=($FileName . ".backup");
-      :set CloudStatus [ / system backup cloud get ([ find ]->0) secret-download-key ];
-    } on-error={
-      :set CloudStatus "failed";
-    }
-  }
+  :set BackupFile ($FileName . ".backup");
+  :set Attach ($Attach, $BackupFile);
 }
 
 # create configuration export
 :if ($BackupSendExport = true) do={
   / export terse file=$FileName;
-  :set ConfigStatus ($FileName . ".rsc");
-  :set Attach ($Attach, $ConfigStatus);
+  :set ConfigFile ($FileName . ".rsc");
+  :set Attach ($Attach, $ConfigFile);
 }
 
 # send email with status and files
 / tool e-mail send to=$EmailBackupTo cc=$EmailBackupCc \
     subject=("[" . $Identity . "] Backup & Config") \
     body=("Backup and config export for " . $Identity . ".\n\n" . \
-      "Board name:      " . $BoardName . "\n" . \
-      "Model:           " . $Model . "\n" . \
-      "Serial number:   " . $SerialNumber . "\n" . \
-      "Hostname:        " . $Identity . "\n" . \
-      "Channel:         " . $Channel . "\n" . \
-      "RouterOS:        " . $InstalledVersion . "\n\n" . \
-      "Backup attached: " . $BackupStatus . "\n" . \
-      "Config attached: " . $ConfigStatus . "\n" . \
-      "Cloud backup:    " . $CloudStatus) \
+      "Board name:    " . $BoardName . "\n" . \
+      "Model:         " . $Model . "\n" . \
+      "Serial number: " . $SerialNumber . "\n" . \
+      "Hostname:      " . $Identity . "\n" . \
+      "Channel:       " . $Channel . "\n" . \
+      "RouterOS:      " . $InstalledVersion . "\n\n" . \
+      "Backup file:   " . $BackupFile . "\n" . \
+      "Config file:   " . $ConfigFile) \
     file=$Attach;
 }
diff --git a/global-config b/global-config
index 1084d8e..ba6f924 100644
--- a/global-config
+++ b/global-config
@@ -6,7 +6,7 @@
 
 # Make sure all configuration properties are up to date and this
 # value is in sync with value in script 'global-functions'!
-:global GlobalConfigVersion 4;
+:global GlobalConfigVersion 5;
 
 # This is used for DNS and backup file.
 :global Domain "example.com";
@@ -30,7 +30,6 @@
 # This defines what backups to generate and what password to use.
 :global BackupSendBinary false;
 :global BackupSendExport true;
-:global BackupCloud false;
 :global BackupPassword "v3ry-s3cr3t";
 
 # Specify an address to enable auto update to version assumed safe.
diff --git a/global-config.changes b/global-config.changes
index b1fae6e..f3c4e2b 100644
--- a/global-config.changes
+++ b/global-config.changes
@@ -7,4 +7,5 @@
   2="variable names became CamelCase to work around scripting issues";
   3="variable for certificate renew passphrase became an array to support multiple passphrases";
   4="added option to ignore global-config changes";
+  5="split off new script cloud-backup from email-backup";
 };
diff --git a/global-functions b/global-functions
index a629ca6..6522bd8 100644
--- a/global-functions
+++ b/global-functions
@@ -5,7 +5,7 @@
 # global functions
 
 # expected configuration version
-:global ExpectedConfigVersion 4;
+:global ExpectedConfigVersion 5;
 
 # global variables not to be changed by user
 :global SentConfigChangesNotification "-";