aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2024-05-15 14:15:54 +0200
committerGravatar Christian Hesse <mail@eworm.de>2024-05-15 15:52:28 +0200
commitca7a592dfd9f19e07bbabc32d999b604bff0d0c9 (patch)
tree433837505056b549a6bd2375964a74bf120d3c8d
parent545fb5583aee9e8971749a7eab71b4040cf7847f (diff)
daily-psk: adopt syntax changesrouteros-7.15beta8-1
RouterOS 7.15beta8 came with this change: *) wifi - show inherited properties with "print" command (replaces "actual-configuration") and added "print config" for showing only configured values; While the old code is bad syntax with RouterOS 7.15, the new code is valid for older RouterOS, but produces different (and more or less unexpected) results. 🥴 Let's use the new code, and add a check on the RouterOS version. With old RouterOS this now sends the notification even if the interface is disabled.
-rw-r--r--daily-psk.capsman.rsc1
-rw-r--r--daily-psk.local.rsc1
-rw-r--r--daily-psk.template.rsc3
-rw-r--r--daily-psk.wifi.rsc3
4 files changed, 6 insertions, 2 deletions
diff --git a/daily-psk.capsman.rsc b/daily-psk.capsman.rsc
index 64e8ce7..985bc47 100644
--- a/daily-psk.capsman.rsc
+++ b/daily-psk.capsman.rsc
@@ -23,6 +23,7 @@
:global FormatLine;
:global LogPrint;
+ :global RequiredRouterOS;
:global ScriptLock;
:global SendNotification2;
:global SymbolForNotification;
diff --git a/daily-psk.local.rsc b/daily-psk.local.rsc
index 48e2b8d..185165a 100644
--- a/daily-psk.local.rsc
+++ b/daily-psk.local.rsc
@@ -23,6 +23,7 @@
:global FormatLine;
:global LogPrint;
+ :global RequiredRouterOS;
:global ScriptLock;
:global SendNotification2;
:global SymbolForNotification;
diff --git a/daily-psk.template.rsc b/daily-psk.template.rsc
index 5097b00..434410b 100644
--- a/daily-psk.template.rsc
+++ b/daily-psk.template.rsc
@@ -24,6 +24,7 @@
:global FormatLine;
:global LogPrint;
+ :global RequiredRouterOS;
:global ScriptLock;
:global SendNotification2;
:global SymbolForNotification;
@@ -85,7 +86,7 @@
/interface/wireless/access-list/set $AccList private-pre-shared-key=$NewPsk;
:if ([ :len [ /caps-man/actual-interface-configuration/find where configuration.ssid=$Ssid !disabled ] ] > 0) do={
- :if ([ :len [ /interface/wifi/actual-configuration/find where configuration.ssid=$Ssid ] ] > 0) do={
+ :if ([ $RequiredRouterOS $ScriptName "7.15beta8" false ] = false || [ :len [ /interface/wifi/find where configuration.ssid=$Ssid !disabled ] ] > 0) do={
:if ([ :len [ /interface/wireless/find where name=$IntName !disabled ] ] = 1) do={
:if ($Seen->$Ssid = 1) do={
$LogPrint debug $ScriptName ("Already sent a mail for SSID " . $Ssid . ", skipping.");
diff --git a/daily-psk.wifi.rsc b/daily-psk.wifi.rsc
index 9d7f285..9b938dc 100644
--- a/daily-psk.wifi.rsc
+++ b/daily-psk.wifi.rsc
@@ -23,6 +23,7 @@
:global FormatLine;
:global LogPrint;
+ :global RequiredRouterOS;
:global ScriptLock;
:global SendNotification2;
:global SymbolForNotification;
@@ -71,7 +72,7 @@
$LogPrint info $ScriptName ("Updating daily PSK for " . $Ssid . " to " . $NewPsk . " (was " . $OldPsk . ")");
/interface/wifi/access-list/set $AccList passphrase=$NewPsk;
- :if ([ :len [ /interface/wifi/actual-configuration/find where configuration.ssid=$Ssid ] ] > 0) do={
+ :if ([ $RequiredRouterOS $ScriptName "7.15beta8" false ] = false || [ :len [ /interface/wifi/find where configuration.ssid=$Ssid !disabled ] ] > 0) do={
:if ($Seen->$Ssid = 1) do={
$LogPrint debug $ScriptName ("Already sent a mail for SSID " . $Ssid . ", skipping.");
} else={