diff --git a/check-perpetual-license.rsc b/check-perpetual-license.rsc index a88498d2..ff775c3d 100644 --- a/check-perpetual-license.rsc +++ b/check-perpetual-license.rsc @@ -42,7 +42,7 @@ $LogPrint warning $ScriptName ("Your license expired on " . ($License->"deadline-at") . "!"); :if ($SentCertificateNotification != "expired") do={ $SendNotification2 ({ origin=$ScriptName; \ - subject=([ $SymbolForNotification "scroll,warning-sign" ] . "License expired!"); \ + subject=([ $SymbolForNotification "scroll,cross-mark" ] . "License expired!"); \ message=("Your license expired on " . ($License->"deadline-at") . \ ", can no longer update RouterOS on " . $Identity . "...") }); :set SentCertificateNotification "expired"; diff --git a/check-routeros-update.rsc b/check-routeros-update.rsc index 8b80ddeb..e5b2e181 100644 --- a/check-routeros-update.rsc +++ b/check-routeros-update.rsc @@ -39,14 +39,11 @@ :local DoUpdate do={ :local ScriptName [ :tostr $1 ]; - :global LogPrint; - :if ([ :len [ /system/script/find where name="packages-update" ] ] > 0) do={ /system/script/run packages-update; } else={ /system/package/update/install without-paging; } - $LogPrint info $ScriptName ("Waiting for system to reboot."); } :if ([ $ScriptLock $ScriptName ] = false) do={ diff --git a/global-functions.rsc b/global-functions.rsc index 75eccb9b..4bd7128b 100644 --- a/global-functions.rsc +++ b/global-functions.rsc @@ -1717,6 +1717,7 @@ :local Magic [ :pick [ /system/clock/get date ] 4 10 ]; :local Special { + "information-04-01"="\F0\9F\9A\BB"; "large-orange-circle-04-01"="\F0\9F\8D\8A"; "large-orange-circle-10-31"="\F0\9F\8E\83"; "large-red-circle-04-01"="\F0\9F\8D\92" }; diff --git a/netwatch-dns.rsc b/netwatch-dns.rsc index eee5f854..60064057 100644 --- a/netwatch-dns.rsc +++ b/netwatch-dns.rsc @@ -94,8 +94,8 @@ :set ($HostInfo->"doh-url") ("https://" . [ $EitherOr $HostName ($HostVal->"host") ] . "/dns-query"); } - :if ($DohCurrent = $HostInfo->"doh-url") do={ - $LogPrint debug $ScriptName ("Current DoH server is still up: " . $DohCurrent); + :if ($DohCurrent = $HostInfo->"doh-url" && [ $IsDNSResolving ] = true) do={ + $LogPrint debug $ScriptName ("Current DoH server is still up and resolving: " . $DohCurrent); :set ExitOK true; :error true; } @@ -105,7 +105,7 @@ } :if ([ :len $DohCurrent ] > 0) do={ - $LogPrint info $ScriptName ("Current DoH server is down, disabling: " . $DohCurrent); + $LogPrint info $ScriptName ("Current DoH server is down or not resolving, disabling: " . $DohCurrent); /ip/dns/set use-doh-server=""; /ip/dns/cache/flush; }