Merge branch 'stable'

Conflicts:
	scripts/rabbitmq-env

2 files changed, 3 insertions, 2 deletions

diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 0b0d51ed46..206bdd0c20 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -189,6 +189,8 @@ DEFAULT_NODE_PORT=5672
 [ "x" = "x$RABBITMQ_GENERATED_CONFIG_DIR" ] && RABBITMQ_GENERATED_CONFIG_DIR=${GENERATED_CONFIG_DIR}
 [ "x" = "x$RABBITMQ_ADVANCED_CONFIG_FILE" ] && RABBITMQ_ADVANCED_CONFIG_FILE=${ADVANCED_CONFIG_FILE}
 [ "x" = "x$RABBITMQ_SCHEMA_DIR" ] && RABBITMQ_SCHEMA_DIR=${SCHEMA_DIR}
+[ "x" = "x$RABBITMQ_IGNORE_SIGINT" ] && RABBITMQ_IGNORE_SIGINT="true"
+[ "xtrue" = "x$RABBITMQ_IGNORE_SIGINT" ] && RABBITMQ_IGNORE_SIGINT_FLAG="+B i"
 
 rmq_normalize_path_var \
     RABBITMQ_CONFIG_FILE \
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index a0500ebb87..48365252e5 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -262,9 +262,8 @@ else
     # When RabbitMQ runs in the foreground but the Erlang shell is
     # disabled, we setup signal handlers to stop RabbitMQ properly. This
     # is at least useful in the case of Docker.
-
     # The Erlang VM should ignore SIGINT.
-    RABBITMQ_SERVER_START_ARGS="${RABBITMQ_SERVER_START_ARGS} +B i"
+    RABBITMQ_SERVER_START_ARGS="${RABBITMQ_SERVER_START_ARGS} ${RABBITMQ_IGNORE_SIGINT_FLAG}"
 
     # Signal handlers. They all stop RabbitMQ properly (using
     # rabbitmqctl stop). Depending on the signal, this script will exit