Crash_Override/routeros-scripts
1
0
Fork 0
mirror of https://github.com/eworm-de/routeros-scripts synced 2024-05-14 08:04:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

lease-script: implement script order

Browse source 
The order may be important: `collect-wireless-mac` can add a dns name
in notification, thus `dhcp-to-dns` should run first.
This commit is contained in:
Christian Hesse 2021-07-08 16:05:11 +02:00
parent 623fd707c4
commit 6bf8cd5fac
10 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
collect-wireless-mac.capsman
View file

@ -6,7 +6,7 @@
# collect wireless mac adresses in access list
# https://git.eworm.de/cgit/routeros-scripts/about/doc/collect-wireless-mac.md
#
# provides: lease-script, assign
# provides: lease-script, assign, order=40
#
# !! Do not edit this file, it is generated from template!

2
collect-wireless-mac.local
View file

@ -6,7 +6,7 @@
# collect wireless mac adresses in access list
# https://git.eworm.de/cgit/routeros-scripts/about/doc/collect-wireless-mac.md
#
# provides: lease-script, assign
# provides: lease-script, assign, order=40
#
# !! Do not edit this file, it is generated from template!

2
collect-wireless-mac.template
View file

@ -6,7 +6,7 @@
# collect wireless mac adresses in access list
# https://git.eworm.de/cgit/routeros-scripts/about/doc/collect-wireless-mac.md
#
# provides: lease-script, assign
# provides: lease-script, assign, order=40
#
# !! This is just a template! Replace '%PATH%' with 'caps-man'
# !! or 'interface wireless'!

2
dhcp-lease-comment.capsman
View file

@ -3,7 +3,7 @@
# Copyright (c) 2013-2021 Christian Hesse <mail@eworm.de>
# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
#
# provides: lease-script, assign
# provides: lease-script, assign, order=60
#
# update dhcp-server lease comment with infos from access-list
# https://git.eworm.de/cgit/routeros-scripts/about/doc/dhcp-lease-comment.md

2
dhcp-lease-comment.local
View file

@ -3,7 +3,7 @@
# Copyright (c) 2013-2021 Christian Hesse <mail@eworm.de>
# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
#
# provides: lease-script, assign
# provides: lease-script, assign, order=60
#
# update dhcp-server lease comment with infos from access-list
# https://git.eworm.de/cgit/routeros-scripts/about/doc/dhcp-lease-comment.md

2
dhcp-lease-comment.template
View file

@ -3,7 +3,7 @@
# Copyright (c) 2013-2021 Christian Hesse <mail@eworm.de>
# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
#
# provides: lease-script, assign
# provides: lease-script, assign, order=60
#
# update dhcp-server lease comment with infos from access-list
# https://git.eworm.de/cgit/routeros-scripts/about/doc/dhcp-lease-comment.md

3
dhcp-to-dns
View file

@ -3,8 +3,7 @@
# Copyright (c) 2013-2021 Christian Hesse <mail@eworm.de>
# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
#
# provides: lease-script, assign
# provides: lease-script, deassign
# provides: lease-script, assign, deassign, order=20
#
# check DHCP leases and add/remove/update DNS entries
# https://git.eworm.de/cgit/routeros-scripts/about/doc/dhcp-to-dns.md

4
doc/lease-script.md
View file

@ -17,10 +17,6 @@ it does:
* run [dhcp-to-dns](dhcp-to-dns.md)
* run [hotspot-to-wpa](hotspot-to-wpa.md)
Note that installation order influences execution order. You may want to
install `dhcp-to-dns` before `collect-wireless-mac` for dns name in
notification.
Requirements and installation
-----------------------------

2
hotspot-to-wpa-cleanup
View file

@ -3,7 +3,7 @@
# Copyright (c) 2021 Christian Hesse <mail@eworm.de>
# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
#
# provides: lease-script, assign
# provides: lease-script, assign, order=80
#
# manage and clean up private WPA passphrase after hotspot login
# https://git.eworm.de/cgit/routeros-scripts/about/doc/hotspot-to-wpa.md

24
lease-script
View file

@ -12,6 +12,7 @@
:global IfThenElse;
:global LogPrintExit2;
:global ParseKeyValueStore;
:if ([ :typeof $leaseActIP ] = "nothing" || \
[ :typeof $leaseActMAC ] = "nothing" || \
@ -21,18 +22,31 @@
}
:local State ([ $IfThenElse ($leaseBound = 0) "de" "" ] . "assign");
:local RunOrder [ :toarray "" ];
$LogPrintExit2 debug $0 ("DHCP Server " . $leaseServerName . " " . \
$State . "ed lease " . $leaseActIP . " to " . $leaseActMAC) false;
:foreach Script in=[ / system script find where source~("\n# provides: lease-script, " . $State . "\n") ] do={
:local ScriptName [ / system script get $Script name ];
:if ([ :len [ / system script job find where script=$ScriptName ] ] < 2) do={
:foreach Script in=[ / system script find where source~("\n# provides: lease-script, ") ] do={
:local Name [ / system script get $Script name ];
:local Store [ / system script get $Script source ];
:set Store [ :pick $Store ([ :find $Store "\n# provides: lease-script, " ] + 27) [ :len $Store ] ];
:set Store [ :pick $Store 0 [ :find $Store "\n" ] ];
:set Store [ $ParseKeyValueStore $Store ];
:if (($Store->$State) = true) do={
:set ($RunOrder->($Store->"order")) $Name;
}
}
:foreach Script in=$RunOrder do={
:if ([ :len [ / system script job find where script=$Script ] ] < 2) do={
:do {
$LogPrintExit2 debug $0 ("Running script: " . $ScriptName) false;
$LogPrintExit2 debug $0 ("Running script: " . $Script) false;
/ system script run $Script;
} on-error={
$LogPrintExit2 warning $0 ("Running script '" . $ScriptName . "' failed!") false;
$LogPrintExit2 warning $0 ("Running script '" . $Script . "' failed!") false;
}
}
}