From 124c37a2100781737100fc84c7f3a5acdd7e6315 Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Thu, 30 Apr 2026 19:35:03 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 19:35:03 30.04.2026. --- html/AM-Backup-UpdateEmail.rsc | 16 ++++++++-------- html/AM-GlobalFunc.rsc | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/html/AM-Backup-UpdateEmail.rsc b/html/AM-Backup-UpdateEmail.rsc index b36b6e999..b8c5c27eb 100644 --- a/html/AM-Backup-UpdateEmail.rsc +++ b/html/AM-Backup-UpdateEmail.rsc @@ -33,6 +33,7 @@ :global LogPrint; :global EditSchedulers; +:global DevInfoIncludeIP; :local SchedInterval "7d"; :local SchedStartTime "03:41:27"; @@ -410,6 +411,13 @@ :set mailBodyDeviceInfo ($mailBodyDeviceInfo . "\nRouterboard FW Available: $ROsVerAvail"); :set mailBodyDeviceInfo ($mailBodyDeviceInfo . "\nDevice date-time: $rawDate $rawTime ($[/system/clock/get time-zone-name ])"); :set mailBodyDeviceInfo ($mailBodyDeviceInfo . "\nUptime: $[/system/resource/get uptime]"); +## IP address detection +:if ([$DevInfoIncludeIP] = true) do={ + :global GetPubIp; + :local PublicIpAddress :put [ $GetPubIp ]; + :set mailBodyDeviceInfo ($mailBodyDeviceInfo . "\nPublic IP address: " . $PublicIpAddress . "."); + :log info ("$SMP Public IP address detected: " . $PublicIpAddress); +} :local mailAttachments [:toarray ""]; :if ($scriptStep = 1 or $scriptStep = 3) do={ @@ -417,14 +425,6 @@ :log info ("$SMP Waiting for one minute before continuing to the final step."); :delay 1m; } -## IP address detection - :global DevInfoIncludeIP; - :if ([$DevInfoIncludeIP] = true) do={ - :global GetPubIp; - :local PublicIpAddress [$GetPubIp]; - :set mailBodyDeviceInfo ($mailBodyDeviceInfo . "\nPublic IP address: " . $PublicIpAddress . "."); - :log info ("$SMP Public IP address detected: " . $PublicIpAddress); - } } ## STEP 1: Create backups, check for new RouterOS, and send email diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 31d166438..80ad691c6 100644 --- a/html/AM-GlobalFunc.rsc +++ b/html/AM-GlobalFunc.rsc @@ -17,9 +17,9 @@ :global GlobalFuncReady false; # Git commit id & info, expected configuration version -:global CommitId "main/301/6985ada3"; +:global CommitId "main/302/fb16df71"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 19:25:02 30.04.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 19:35:03 30.04.2026."; # The variables are received right here. :global GlobalConfVersion 138; -- 2.52.0