Commit graph

41 commits

Author SHA1 Message Date
Christian Hesse
f46db91845 global: give script or function name in log messages 2021-02-24 21:51:54 +01:00
Christian Hesse
49737af6d1 extend magic pattern with "by RouterOS"
This matches the string included in export.
2020-09-18 11:00:27 +02:00
Christian Hesse
04460debfc script-updates: fix syntax error 2020-03-31 12:51:37 +02:00
Christian Hesse
5f46ef7635 completely replace script-updates with $ScriptInstallUpdate 2020-03-23 14:01:20 +01:00
Christian Hesse
98585afe1c add script 'global-wait'
Run this in schedulers that fire on startup without interval. Schedulers
should look something like this:

/ system scheduler {
  add name=global-scripts on-event="/ system script { run global-config; run global-config-overlay; run global-functions; }" start-time=startup;
  add name=bridge-port-to-default on-event="/ system script { run global-wait; run bridge-port-to-default; }" start-time=startup;
}
2020-03-12 08:40:29 +01:00
Christian Hesse
8020955b3b script-updates: also consider scripts with empty source for update 2020-03-05 20:09:36 +01:00
Christian Hesse
34255c9050 script-updates: use $LogPrintExit for debug 2020-03-05 08:58:29 +01:00
Christian Hesse
001e7eeb39 global-functions: sort alphabetically 2020-02-28 15:26:26 +01:00
Christian Hesse
ceaa83b83e global-functions: merge $LogAnd{Error,Put} to $LogPrintExit ...
... and fix logging.

Logging with severity from variable (:log $severity ...) is not
possible, this is considered a syntax error. Also the 'workaround' with
parsing code failed with missing message in log.

The reliable code is a lot longer, so merge the two functions to save a
lot of duplicate code.
2020-02-26 14:19:54 +01:00
Christian Hesse
d516b1b249 script-updates: use $LogAndPut 2020-02-26 12:15:07 +01:00
Christian Hesse
5316ec6ef5 script-updates: warn on scheduler at startup with no interval 2020-02-24 19:43:35 +01:00
Christian Hesse
38b23ddc10 script-updates: prefix variable name with dollar 2020-02-05 17:09:30 +01:00
Christian Hesse
b5f4c2c87e global-config: drop $ScriptUpdatesConfigChangesIgnore
Comment or remove $GlobalConfigVersion in global-config-overlay
to disable change notifications.
2020-02-04 20:19:46 +01:00
Christian Hesse
833e72eac8 script-updates: only handle scripts with magic pattern
This is supposed to prevent overwriting foreign scripts. New scripts are
expected to be installed with function $ScriptInstallUpdate!
2020-01-29 21:44:41 +01:00
Christian Hesse
afb9839073 update copyright for 2020 2020-01-01 17:00:39 +01:00
Christian Hesse
1cee36a911 introduce global-config-overlay 2019-09-12 21:29:41 +02:00
Christian Hesse
166bbffe1d script-updates: add donation hint in configuration warning notification 2019-08-30 14:10:58 +02:00
Christian Hesse
1ee3213e02 script-updates: better regex matching 2019-08-29 09:13:11 +02:00
Christian Hesse
25a22e2e1c script-updates: get source from array 2019-07-25 21:19:10 +02:00
Christian Hesse
d9d98cfe9e script-updates: get values into arrays 2019-07-25 13:12:17 +02:00
Christian Hesse
27b2fffaaf script-updates: clear variable after use 2019-04-03 13:14:09 +02:00
Christian Hesse
ea73505ecc script-updates: send global-config changes notification just once 2019-04-03 08:30:28 +02:00
Christian Hesse
7b1c275cc2 script-updates: add option to ignore global-config changes 2019-04-02 08:48:35 +02:00
Christian Hesse
40201ac1ea script-updates: add changelog for global configuration 2019-04-01 12:39:37 +02:00
Christian Hesse
870f00bb36 global: variable names are CamelCase
___  _         ___     __
           / _ )(_)__ _   / _/__ _/ /_
          / _  / / _ `/  / _/ _ `/ __/
         /____/_/\_, /  /_/ \_,_/\__/
 _       __     /___/       _             __
| |     / /___ __________  (_)___  ____ _/ /
| | /| / / __ `/ ___/ __ \/ / __ \/ __ `/ /
| |/ |/ / /_/ / /  / / / / / / / / /_/ /_/
|__/|__/\__,_/_/  /_/ /_/_/_/ /_/\__, (_)
                                /____/

RouterOS has some odd behavior when it comes to variable names. Let's
have a look at the interfaces:

[admin@MikroTik] > / interface print where name=en1
Flags: D - dynamic, X - disabled, R - running, S - slave
 #     NAME                                TYPE       ACTUAL-MTU L2MTU
 0  RS en1                                 ether            1500  1598

That looks ok. Now we use a script:

{ :local interface "en1";
  / interface print where name=$interface; }

And the result...

[admin@MikroTik] > { :local interface "en1";
{...   / interface print where name=$interface; }
Flags: D - dynamic, X - disabled, R - running, S - slave
 #     NAME                                TYPE       ACTUAL-MTU L2MTU
 0  RS en1                                 ether            1500  1598

... still looks ok.
We make a little modification to the script:

{ :local name "en1";
  / interface print where name=$name; }

And the result:

[admin@MikroTik] > { :local name "en1";
{...   / interface print where name=$name; }
Flags: D - dynamic, X - disabled, R - running, S - slave
 #     NAME                                TYPE       ACTUAL-MTU L2MTU
 0  RS en1                                 ether            1500  1598
 1   S en2                                 ether            1500  1598
 2   S en3                                 ether            1500  1598
 3   S en4                                 ether            1500  1598
 4   S en5                                 ether            1500  1598
 5  R  br-local                            bridge           1500  1598

Ups! The filter has no effect!
That happens whenever the variable name ($name) matches the property
name (name=).

And another modification:

{ :local type "en1";
  / interface print where name=$type; }

And the result:

[admin@MikroTik] > { :local type "en1";
{...   / interface print where name=$type; }
Flags: D - dynamic, X - disabled, R - running, S - slave
 #     NAME                                TYPE       ACTUAL-MTU L2MTU

Ups! Nothing?
Even if the variable name ($type) matches whatever property name (type=)
things go wrong.

The answer from MikroTik support (in Ticket#2019010222000454):

> This is how scripting works in RouterOS and we will not fix it.

To get around this we use variable names in CamelCase. Let's hope
Mikrotik never ever introduces property names in CamelCase...

*fingers crossed*
2019-01-04 12:35:34 +01:00
Christian Hesse
6e03a3b935 script-updates: add configuration versioning 2019-01-03 15:36:26 +01:00
Christian Hesse
472cd3d905 update copyright for 2019 2019-01-02 09:38:34 +01:00
Christian Hesse
b62f9b7a65 script-updates: run global-functions on update 2018-10-16 21:22:47 +02:00
Christian Hesse
4eba04b9c4 script-updates: allow to set dont-require-permissions=yes
This requires the new script to contain a line:

# requires: dont-require-permissions=yes
2018-10-12 11:15:46 +02:00
Christian Hesse
5303c034b9 script-updates: make sure new script starts with magic 2018-09-28 21:44:03 +02:00
Christian Hesse
be673737d3 start scripts with a magic token / shebang 2018-09-27 00:18:43 +02:00
Christian Hesse
ea5083a427 script-updates: add error handling back in
We have to make sure the script does not terminate on first error...
2018-09-14 11:10:03 +02:00
Christian Hesse
374c9c09ba script-updates: check and warn about policies 2018-09-13 13:16:14 +02:00
Christian Hesse
838debd6cf script-updates: fetch into variable 2018-09-03 17:31:22 +02:00
Christian Hesse
21f2b04f9a script-updates: add support for url suffix
This allows to fetch from different branch...
2018-08-27 11:15:03 +02:00
Christian Hesse
07e54dd88b add empty comment at first line...
... for better formatting in export.
2018-08-24 16:58:30 +02:00
Christian Hesse
a80591f510 script-updates: always accept updates from file 2018-07-10 00:05:30 +02:00
Christian Hesse
8593c7a2f2 script-updates: handle error on fetch 2018-07-09 22:27:29 +02:00
Christian Hesse
44a6c1ca8b script-updates: check certificate on fetch 2018-07-09 17:16:55 +02:00
Christian Hesse
56e641a980 script-updates: support fetch from url 2018-07-09 16:05:04 +02:00
Christian Hesse
e1f134ead5 add scripts 2018-07-05 15:34:08 +02:00