diff options
| author |  Christian Hesse <mail@eworm.de> | 2020-12-18 17:04:22 +0100 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2020-12-18 20:32:29 +0100 |
| commit | 40dc2415d3c414d77f31084936040d586d8c8acb (patch) | |
| tree | e91c776d258043369a4ebe6b5b83e00e3140d091 | |
| parent | 05a9531dac25c1ab0cc9fc8533818647ef5f6f6c (diff) | |
global-functions: $ScriptInstallUpdate: make Let's Encrypt certificate semi-mandatory
... and remove the migration from changes.
| -rw-r--r-- | global-config.changes | 5 | ||||
| -rw-r--r-- | global-functions | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/global-config.changes b/global-config.changes index 80fa5d8..3c06553 100644 --- a/global-config.changes +++ b/global-config.changes @@ -2,11 +2,6 @@ # Copyright (c) 2019-2020 Christian Hesse <mail@eworm.de> # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md -:global CertificateAvailable; - -# import new Let's Encrypt intermediate certificate 'R3' -$CertificateAvailable "R3"; - # Changes for global-config to be added to notification on script updates :global GlobalConfigChanges { 1="Moved variables from 'global-config' to 'global-functions' for independence"; diff --git a/global-functions b/global-functions index b2337bc..9ee2d00 100644 --- a/global-functions +++ b/global-functions @@ -552,11 +552,16 @@ :global ScriptUpdatesUrlSuffix; :global SentConfigChangesNotification; + :global CertificateAvailable; :global LogPrintExit; :global ParseKeyValueStore; :global SendNotification; :global SymbolForNotification; + :if ([ $CertificateAvailable "R3" ] = false) do={ + $LogPrintExit warning ("Downloading certificate failed, trying without.") false; + } + :foreach Script in=$Scripts do={ :if ([ :len [ / system script find where name=$Script ] ] = 0) do={ $LogPrintExit info ("Adding new script: " . $Script) false; |