groove/routeros-scripts-main
1
0
Fork 0
mirror of https://github.com/eworm-de/routeros-scripts.git synced 2026-05-18 17:32:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'backup-filename-date' into next

Browse source
This commit is contained in:
Christian Hesse 2026-04-24 14:32:01 +02:00
commit cd4052ba6b
7 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
backup-email.rsc
View file

@ -16,6 +16,7 @@
do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50; do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
:local ScriptName [ :jobname ]; :local ScriptName [ :jobname ];
:global BackupFileNameDate;
:global BackupPassword; :global BackupPassword;
:global BackupRandomDelay; :global BackupRandomDelay;
:global BackupSendBinary; :global BackupSendBinary;
@ -73,7 +74,9 @@
# filename based on identity # filename based on identity
:local DirName ("tmpfs/" . $ScriptName); :local DirName ("tmpfs/" . $ScriptName);
:local FileName [ $CleanName ($Identity . "." . $Domain) ]; :local Clock [ /system/clock/get ];
:local FileName [ $CleanName ($Identity . "." . $Domain . [ $IfThenElse \
($BackupFileNameDate = true) ("-" . $Clock->"date" . "-" . $Clock->"time") "" ] ) ];
:local FilePath ($DirName . "/" . $FileName); :local FilePath ($DirName . "/" . $FileName);
:local BackupFile "none"; :local BackupFile "none";
:local ExportFile "none"; :local ExportFile "none";

5
backup-upload.rsc
View file

@ -17,6 +17,7 @@
do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50; do={ :error ("Global config and/or functions not ready."); }; } delay=500ms max=50;
:local ScriptName [ :jobname ]; :local ScriptName [ :jobname ];
:global BackupFileNameDate;
:global BackupPassword; :global BackupPassword;
:global BackupRandomDelay; :global BackupRandomDelay;
:global BackupSendBinary; :global BackupSendBinary;
@ -72,7 +73,9 @@
# filename based on identity # filename based on identity
:local DirName ("tmpfs/" . $ScriptName); :local DirName ("tmpfs/" . $ScriptName);
:local FileName [ $CleanName ($Identity . "." . $Domain) ]; :local Clock [ /system/clock/get ];
:local FileName [ $CleanName ($Identity . "." . $Domain . [ $IfThenElse \
($BackupFileNameDate = true) ("-" . $Clock->"date" . "-" . $Clock->"time") "" ] ) ];
:local FilePath ($DirName . "/" . $FileName); :local FilePath ($DirName . "/" . $FileName);
:local BackupFile "none"; :local BackupFile "none";
:local ExportFile "none"; :local ExportFile "none";

1
doc/backup-email.md
View file

@ -34,6 +34,7 @@ Configuration
The configuration goes to `global-config-overlay`, these are the parameters: The configuration goes to `global-config-overlay`, these are the parameters:
* `BackupFileNameDate`: whether to add date & time in filenames
* `BackupSendBinary`: whether to send binary backup * `BackupSendBinary`: whether to send binary backup
* `BackupSendExport`: whether to send configuration export * `BackupSendExport`: whether to send configuration export
* `BackupSendGlobalConfig`: whether to send `global-config-overlay` * `BackupSendGlobalConfig`: whether to send `global-config-overlay`

1
doc/backup-upload.md
View file

@ -40,6 +40,7 @@ Configuration
The configuration goes to `global-config-overlay`, these are the parameters: The configuration goes to `global-config-overlay`, these are the parameters:
* `BackupFileNameDate`: whether to add date & time in filenames
* `BackupSendBinary`: whether to send binary backup * `BackupSendBinary`: whether to send binary backup
* `BackupSendExport`: whether to send configuration export * `BackupSendExport`: whether to send configuration export
* `BackupSendGlobalConfig`: whether to send `global-config-overlay` * `BackupSendGlobalConfig`: whether to send `global-config-overlay`

5
global-config.rsc
View file

@ -90,8 +90,9 @@
# Toggle this to disable color output in terminal/cli. # Toggle this to disable color output in terminal/cli.
:global TerminalColorOutput true; :global TerminalColorOutput true;
# This defines what backups to generate, the password to use, # This defines whether to add date & time in filenames, what backups to generate,
# and what random delay (between 0 and given seconds) to apply. # the password to use, and what random delay (between 0 and given seconds) to apply.
:global BackupFileNameDate false;
:global BackupSendBinary false; :global BackupSendBinary false;
:global BackupSendExport true; :global BackupSendExport true;
:global BackupSendGlobalConfig true; :global BackupSendGlobalConfig true;

2
global-functions.rsc
View file

@ -15,7 +15,7 @@
# Git commit id & info, expected configuration version # Git commit id & info, expected configuration version
:global CommitId "unknown"; :global CommitId "unknown";
:global CommitInfo "unknown"; :global CommitInfo "unknown";
:global ExpectedConfigVersion 142; :global ExpectedConfigVersion 143;
# global variables not to be changed by user # global variables not to be changed by user
:global GlobalFunctionsReady false; :global GlobalFunctionsReady false;

1
news-and-changes.rsc
View file

@ -67,6 +67,7 @@
140="The scripts 'lease-script' was renamed to 'dhcpv4-server-lease', configuration was updated automatically."; 140="The scripts 'lease-script' was renamed to 'dhcpv4-server-lease', configuration was updated automatically.";
141="Introduced script 'dhcpv6-client-lease' to run several scripts on IPv6 DHCP client lease."; 141="Introduced script 'dhcpv6-client-lease' to run several scripts on IPv6 DHCP client lease.";
142="Added a setting for 'mod/notification-email' to check availability of certificate chain."; 142="Added a setting for 'mod/notification-email' to check availability of certificate chain.";
143="Made backup scripts 'backup-email' and 'backup-upload' support date & time in filenames.";
}; };
# Migration steps to be applied on script updates # Migration steps to be applied on script updates