diff options
| author |  Christian Hesse <mail@eworm.de> | 2024-05-24 20:35:06 +0200 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2024-06-25 08:07:16 +0200 |
| commit | 8c90329549d366b20ea415a07e539ec43f3e4ab7 (patch) | |
| tree | 1076cb485f3c82125d3f949f3fdc2b79d5cf9323 | |
| parent | 1ad3e0bd3004dd83aafecf127a50ed73513d11b4 (diff) | |
daily-psk: drop workaround for old RouterOS
| -rw-r--r-- | daily-psk.capsman.rsc | 1 | ||||
| -rw-r--r-- | daily-psk.local.rsc | 1 | ||||
| -rw-r--r-- | daily-psk.template.rsc | 3 | ||||
| -rw-r--r-- | daily-psk.wifi.rsc | 3 |
4 files changed, 2 insertions, 6 deletions
diff --git a/daily-psk.capsman.rsc b/daily-psk.capsman.rsc index cd5b6b0..eed1b16 100644 --- a/daily-psk.capsman.rsc +++ b/daily-psk.capsman.rsc @@ -23,7 +23,6 @@ :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 fbdb784..fe21665 100644 --- a/daily-psk.local.rsc +++ b/daily-psk.local.rsc @@ -23,7 +23,6 @@ :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 35fa82c..62b956d 100644 --- a/daily-psk.template.rsc +++ b/daily-psk.template.rsc @@ -24,7 +24,6 @@ :global FormatLine; :global LogPrint; - :global RequiredRouterOS; :global ScriptLock; :global SendNotification2; :global SymbolForNotification; @@ -86,7 +85,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 ([ $RequiredRouterOS $ScriptName "7.15beta8" false ] = false || [ :len [ /interface/wifi/find where configuration.ssid=$Ssid !disabled ] ] > 0) do={ + :if ([ :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 c1f7133..054ab19 100644 --- a/daily-psk.wifi.rsc +++ b/daily-psk.wifi.rsc @@ -23,7 +23,6 @@ :global FormatLine; :global LogPrint; - :global RequiredRouterOS; :global ScriptLock; :global SendNotification2; :global SymbolForNotification; @@ -72,7 +71,7 @@ $LogPrint info $ScriptName ("Updating daily PSK for '" . $Ssid . "' to '" . $NewPsk . "' (was '" . $OldPsk . "')"); /interface/wifi/access-list/set $AccList passphrase=$NewPsk; - :if ([ $RequiredRouterOS $ScriptName "7.15beta8" false ] = false || [ :len [ /interface/wifi/find where configuration.ssid=$Ssid !disabled ] ] > 0) do={ + :if ([ :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={ |