From 5664449f643e937a2ce2586343f72e2939f4ad66 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Sat, 12 Jan 2019 15:48:48 +0100 Subject: initial-commands: put into blocks --- initial-commands | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/initial-commands b/initial-commands index 86f46ba..c42b001 100644 --- a/initial-commands +++ b/initial-commands @@ -5,18 +5,24 @@ { / tool fetch "https://git.eworm.de/cgit.cgi/routeros-scripts/plain/certs/letsencrypt.pem" dst-path="letsencrypt.pem"; :delay 1s; - / certificate import file-name=letsencrypt.pem passphrase=""; - / certificate set name="ISRG-Root-X1" [ find where fingerprint="96bcec06264976f37460779acf28c5a7cfe8a3c0aae11a8ffcee05c0bddf08c6" ]; - / certificate set name="Let-s-Encrypt-Authority-X3" [ find where fingerprint="731d3d9cfaa061487a1d71445a42f67df0afca2a6c2d2f98ff7b3ce112b1f568" ]; - / certificate set name="DST-Root-CA-X3" [ find where fingerprint="0687260331a72403d909f105e69bcf0d32e1bd2493ffc6d9206d11bcd6770739" ]; + / certificate { + import file-name=letsencrypt.pem passphrase=""; + set name="ISRG-Root-X1" [ find where fingerprint="96bcec06264976f37460779acf28c5a7cfe8a3c0aae11a8ffcee05c0bddf08c6" ]; + set name="Let-s-Encrypt-Authority-X3" [ find where fingerprint="731d3d9cfaa061487a1d71445a42f67df0afca2a6c2d2f98ff7b3ce112b1f568" ]; + set name="DST-Root-CA-X3" [ find where fingerprint="0687260331a72403d909f105e69bcf0d32e1bd2493ffc6d9206d11bcd6770739" ]; + } :if ([ / certificate print count-only where fingerprint="96bcec06264976f37460779acf28c5a7cfe8a3c0aae11a8ffcee05c0bddf08c6" or fingerprint="731d3d9cfaa061487a1d71445a42f67df0afca2a6c2d2f98ff7b3ce112b1f568" or fingerprint="0687260331a72403d909f105e69bcf0d32e1bd2493ffc6d9206d11bcd6770739" ] != 3) do={ :error "Anything is wrong with your certificates!"; } :foreach Script in={ "global-config"; "global-functions"; "script-updates" } do={ / system script add name=$Script source=([ / tool fetch check-certificate=yes-without-crl ("https://git.eworm.de/cgit.cgi/routeros-scripts/plain/" . $Script) output=user as-value]->"data"); } - / system script run global-config; - / system script run global-functions; - / system scheduler add name=global-config start-time=startup on-event=global-config; - / system scheduler add name=global-functions start-time=startup on-event=global-functions; + / system script { + run global-config; + run global-functions; + } + / system scheduler { + add name=global-config start-time=startup on-event=global-config; + add name=global-functions start-time=startup on-event=global-functions; + } } -- cgit v1.2.3-54-g00ecf