diff options
| author | Tim Watson <tim@rabbitmq.com> | 2013-09-27 16:51:15 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2013-09-27 16:51:15 +0100 |
| commit | 5f97630f24b0eb8c15b9ef18a063ad17967b2fdb (patch) | |
| tree | c8116e129806bc6812fc892e214c9e6f0f32c34f | |
| parent | 59923ac4903635a1f5ee473e698dbf493fd6e8ed (diff) | |
| download | rabbitmq-server-git-5f97630f24b0eb8c15b9ef18a063ad17967b2fdb.tar.gz | |
Document the fake DOC_INSTALL_DIR in the rpm spec; additional config and documentation
| -rw-r--r-- | docs/rabbitmq.config.example | 11 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example index 4fb8359c1f..13f7684504 100644 --- a/docs/rabbitmq.config.example +++ b/docs/rabbitmq.config.example @@ -201,9 +201,16 @@ {kernel, [%% Provide an explicit port-range for inter-node communications. %% See http://www.rabbitmq.com/clustering.html#firewall for further details. - %% + + %% Sets the minimum port number. {inet_dist_listen_min, 10000}, - {inet_dist_listen_max, 10005} + + %% Sets the maximum port number. + {inet_dist_listen_max, 10005}, + + %% Sets the net_kernel tick time. This is an advanced option. + %% Please see http://erlang.org/doc/man/kernel_app.html for further details. + {net_ticktime, 60} ]} %% ---------------------------------------------------------------------------- diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 63538210a7..b1819cfd40 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -46,10 +46,12 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} +# Note that we pass /tmp to DOC_INSTALL_DIR here because we're using %doc +# to actually install rabbitmq.config.example, so this is just a fake/temp path make install TARGET_DIR=%{_maindir} \ SBIN_DIR=%{buildroot}%{_rabbit_libdir}/bin \ MAN_DIR=%{buildroot}%{_mandir} \ - DOC_INSTALL_DIR=/tmp/ + DOC_INSTALL_DIR=/tmp mkdir -p %{buildroot}%{_localstatedir}/lib/rabbitmq/mnesia mkdir -p %{buildroot}%{_localstatedir}/log/rabbitmq |