From b497edd092b5b01e7601460308c45d6970fabb54 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 28 Apr 2021 15:11:08 +0200 Subject: global-config: comment on overriding e-mail and Telegram settings --- global-config | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'global-config') diff --git a/global-config b/global-config index 107ef19..58c9617 100644 --- a/global-config +++ b/global-config @@ -33,6 +33,13 @@ # This is whether or not to send Telegram messages with fixed-width font. :global TelegramFixedWidthFont true; +# It is possible to override e-mail and Telegram setting for every script. +# This is done in arrays EmailGeneralToOverride, EmailGeneralCcOverride, +# TelegramTokenIdOverride and TelegramChatIdOverride like this: +#:global EmailGeneralToOverride { +# "check-certificates"="override@example.com"; +#} + # Toggle this to disable symbols in notifications. :global NotificationsWithSymbols true; # Toggle this to disable color output in terminal/cli. -- cgit v1.2.3-54-g00ecf From 56b75237754eb065aecb932b3082ba0ca29c3f7c Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Wed, 28 Apr 2021 15:33:37 +0200 Subject: global-functions: notify about settings override --- global-config | 2 +- global-config-overlay | 2 +- global-config.changes | 1 + global-functions | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) (limited to 'global-config') diff --git a/global-config b/global-config index 58c9617..9e69c18 100644 --- a/global-config +++ b/global-config @@ -8,7 +8,7 @@ # Make sure all configuration properties are up to date and this # value is in sync with value in script 'global-functions'! -:global GlobalConfigVersion 47; +:global GlobalConfigVersion 48; # This is used for DNS and backup file. :global Domain "example.com"; diff --git a/global-config-overlay b/global-config-overlay index 850e6d8..316fde5 100644 --- a/global-config-overlay +++ b/global-config-overlay @@ -8,7 +8,7 @@ # Make sure all configuration properties are up to date and this # value is in sync with value in script 'global-functions'! # Comment or remove to disable news and change notifications. -:global GlobalConfigVersion 47; +:global GlobalConfigVersion 48; # Copy configuration from global-config here and modify it. diff --git a/global-config.changes b/global-config.changes index 2dc68f7..d3d1059 100644 --- a/global-config.changes +++ b/global-config.changes @@ -51,6 +51,7 @@ 45="We have a Telegram Group! Come along and say hello: https://t.me/routeros_scripts"; 46="Added configurable random delay in backup scripts to stretch execution and prevent resource congestion."; 47="Removed obsolete intermediate certificate 'Let's Encrypt Authority X3' from store."; + 48="Added support for overriding e-mail and Telegram settings for every script."; }; # Migration steps to be applied on script updates diff --git a/global-functions b/global-functions index ddddcb8..ff16076 100644 --- a/global-functions +++ b/global-functions @@ -8,7 +8,7 @@ # https://git.eworm.de/cgit/routeros-scripts/about/ # expected configuration version -:global ExpectedConfigVersion 47; +:global ExpectedConfigVersion 48; # global variables not to be changed by user :global GlobalFunctionsReady false; -- cgit v1.2.3-54-g00ecf