From 686b28fb720fed16c73cdf3970af75d75e197275 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Tue, 1 Oct 2024 20:23:38 -0400 Subject: [PATCH] Add a rabbit.license_line default so that products that build on top could adjust what's printed in the standard banner. References #12390 (cherry picked from commit 1f98ab60266acfedd611dcb123e46b5093762e1c) (cherry picked from commit 9c6db87f8e7aaa48f3eb64318f29e88e990047f1) --- deps/rabbit/BUILD.bazel | 7 ++----- deps/rabbit/Makefile | 5 ++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel index 312be72400dd..5fee627aadc5 100644 --- a/deps/rabbit/BUILD.bazel +++ b/deps/rabbit/BUILD.bazel @@ -142,13 +142,10 @@ _APP_ENV = """[ {credentials_obfuscation_fallback_secret, <<"nocookie">>}, {dead_letter_worker_consumer_prefetch, 32}, {dead_letter_worker_publisher_confirm_timeout, 180000}, - - %% EOL date for the current release series, if known/announced - {release_series_eol_date, none}, - {vhost_process_reconciliation_run_interval, 30}, %% for testing - {vhost_process_reconciliation_enabled, true} + {vhost_process_reconciliation_enabled, true}, + {license_line, "Licensed under the MPL 2.0. Website: https://rabbitmq.com"} ] """ diff --git a/deps/rabbit/Makefile b/deps/rabbit/Makefile index 2ff50e6cd0e2..a96721376e5d 100644 --- a/deps/rabbit/Makefile +++ b/deps/rabbit/Makefile @@ -125,11 +125,10 @@ define PROJECT_ENV {credentials_obfuscation_fallback_secret, <<"nocookie">>}, {dead_letter_worker_consumer_prefetch, 32}, {dead_letter_worker_publisher_confirm_timeout, 180000}, - %% EOL date for the current release series, if known/announced - {release_series_eol_date, none}, {vhost_process_reconciliation_run_interval, 30}, %% for testing - {vhost_process_reconciliation_enabled, true} + {vhost_process_reconciliation_enabled, true}, + {license_line, "Licensed under the MPL 2.0. Website: https://rabbitmq.com"} ] endef