diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2019-02-13 12:45:24 -0800 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2019-02-14 00:05:27 +0300 |
| commit | de2818537e2e1c4bf773c2b7d9b23059e562f393 (patch) | |
| tree | fd6879b3c085d413e3b9a65281145979137ed63e | |
| parent | 58b0c9ca97c7b416e4cf39d66e8d68ef90ccbc99 (diff) | |
| download | rabbitmq-server-git-de2818537e2e1c4bf773c2b7d9b23059e562f393.tar.gz | |
Remove inet_dist_listen_min / max from ini schema since they do not work
(cherry picked from commit 260098ecd053ec10e407ec65ac2a17512f4d4455)
| -rw-r--r-- | priv/schema/rabbit.schema | 10 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server | 2 | ||||
| -rw-r--r-- | test/config_schema_SUITE_data/rabbit.snippets | 13 |
3 files changed, 1 insertions, 24 deletions
diff --git a/priv/schema/rabbit.schema b/priv/schema/rabbit.schema index 2617f558f7..4cc543d99f 100644 --- a/priv/schema/rabbit.schema +++ b/priv/schema/rabbit.schema @@ -1352,16 +1352,6 @@ end}. {validators, ["non_zero_positive_integer"]} ]}. -{mapping, "inet_dist_listen_min", "kernel.inet_dist_listen_min",[ - {datatype, [integer]}, - {validators, ["non_zero_positive_integer"]} -]}. - -{mapping, "inet_dist_listen_max", "kernel.inet_dist_listen_max",[ - {datatype, [integer]}, - {validators, ["non_zero_positive_integer"]} -]}. - % ========================== % sysmon_handler section % ========================== diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index 66ce4ac525..4bb680cccf 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -187,7 +187,7 @@ RABBITMQ_PRELAUNCH_NODENAME="rabbitmqprelaunch${$}@localhost" NOTIFY_SOCKET= \ RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \ ERL_CRASH_DUMP=$ERL_CRASH_DUMP \ -RABBITMQ_CONFIG_ARG_FILE=$RABBITMQ_CONFIG_ARG_FILE \ +RABBITMQ_CONFIG_ARG_FILE=$RABBITMQ_CONFIG_ARG_FILE \ RABBITMQ_DIST_PORT=$RABBITMQ_DIST_PORT \ ${ERL_DIR}erl -pa "$RABBITMQ_EBIN_ROOT" \ -boot "${CLEAN_BOOT_FILE}" \ diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets index 0cd274b757..9afddd9b1e 100644 --- a/test/config_schema_SUITE_data/rabbit.snippets +++ b/test/config_schema_SUITE_data/rabbit.snippets @@ -580,19 +580,6 @@ credential_validator.regexp = ^abc\\d+", ]}], []}, - {kernel_inet_dist_listen_min, - "inet_dist_listen_min = 16000", - [{kernel, [ - {inet_dist_listen_min, 16000} - ]}], - []}, - {kernel_inet_dist_listen_max, - "inet_dist_listen_max = 16100", - [{kernel, [ - {inet_dist_listen_max, 16100} - ]}], - []}, - {log_syslog_settings, "log.syslog = true log.syslog.identity = rabbitmq |