global-functions: $ScriptInstallUpdate: make Let's Encrypt certificate semi-mandatory

... and remove the migration from changes.
This commit is contained in:
Christian Hesse 2020-12-18 17:04:22 +01:00
parent 05a9531dac
commit 40dc2415d3
2 changed files with 5 additions and 5 deletions

View file

@ -2,11 +2,6 @@
# Copyright (c) 2019-2020 Christian Hesse <mail@eworm.de> # Copyright (c) 2019-2020 Christian Hesse <mail@eworm.de>
# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md # 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 # Changes for global-config to be added to notification on script updates
:global GlobalConfigChanges { :global GlobalConfigChanges {
1="Moved variables from 'global-config' to 'global-functions' for independence"; 1="Moved variables from 'global-config' to 'global-functions' for independence";

View file

@ -552,11 +552,16 @@
:global ScriptUpdatesUrlSuffix; :global ScriptUpdatesUrlSuffix;
:global SentConfigChangesNotification; :global SentConfigChangesNotification;
:global CertificateAvailable;
:global LogPrintExit; :global LogPrintExit;
:global ParseKeyValueStore; :global ParseKeyValueStore;
:global SendNotification; :global SendNotification;
:global SymbolForNotification; :global SymbolForNotification;
:if ([ $CertificateAvailable "R3" ] = false) do={
$LogPrintExit warning ("Downloading certificate failed, trying without.") false;
}
:foreach Script in=$Scripts do={ :foreach Script in=$Scripts do={
:if ([ :len [ / system script find where name=$Script ] ] = 0) do={ :if ([ :len [ / system script find where name=$Script ] ] = 0) do={
$LogPrintExit info ("Adding new script: " . $Script) false; $LogPrintExit info ("Adding new script: " . $Script) false;