diff options
| author | Tim Watson <tim@rabbitmq.com> | 2013-09-27 15:18:51 +0100 |
|---|---|---|
| committer | Tim Watson <tim@rabbitmq.com> | 2013-09-27 15:18:51 +0100 |
| commit | b1a008cb247114d70d79160ace6239fe5d3332ba (patch) | |
| tree | 550a9d7f4659325d4b7b27b6602b68fd0a3dded1 | |
| parent | a5a1ab5f04bae4081da3ecdf6bda738726e0f75d (diff) | |
| download | rabbitmq-server-b1a008cb247114d70d79160ace6239fe5d3332ba.tar.gz | |
Further tidying of the sample config docs, make DOC_INSTALL_DIR mandatory
| -rw-r--r-- | docs/rabbitmq.config.example | 18 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 2 | ||||
| -rw-r--r-- | packaging/windows/Makefile | 4 |
3 files changed, 15 insertions, 9 deletions
diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example index ffb4b0c3..4fb8359c 100644 --- a/docs/rabbitmq.config.example +++ b/docs/rabbitmq.config.example @@ -301,14 +301,18 @@ %% ---------------------------------------------------------------------------- {rabbitmq_stomp, - [%% Listen only on localhost (ipv4 & ipv6) on a specific port. + [%% Network Configuration - the format is generally the same as for the broker. + + %% Listen only on localhost (ipv4 & ipv6) on a specific port. %% {tcp_listeners, [{"127.0.0.1", 61612}, %% {"::1", 61612}]}, %% Listen for SSL connections on a specific port. %% {ssl_listeners, [61613]}, - %% Extract name from client certificate when using SSL. + %% Additional SSL options + + %% Extract a name from the client's certificate when using SSL. %% {ssl_cert_login, true}, %% Use cn instead of dn when reading from the SSL cert. @@ -334,10 +338,12 @@ %% {default_user, <<"guest">>}, %% {default_pass, <<"guest">>}, - %% Enable anonymous access. + %% Enable anonymous access. If this is set to false, clients MUST provide + %% login information in order to connect. + %% %% {allow_anonymous, true}, - %% Specify the vhost to which the adapter connects. + %% If you have multiple chosts, specify the one to which the adapter connects. %% {vhost, <<"/">>}, %% Specify the exchange to which messages from MQTT clients are published. @@ -347,10 +353,10 @@ %% {subscription_ttl, 1800000}, %% Set the prefetch count (governing the maximum number of unacknowledged - %% messages that will be delivered). + %% messages that will be delivered). %% {prefetch, 10}, - %% TCP/SSL Configuration (as per the broker configuration) + %% TCP/SSL Configuration (as per the broker configuration). %% {ssl_listeners, []}, %% {tcp_listeners, [1883]}, diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 1e4d2d59..63538210 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -119,7 +119,7 @@ done %{_initrddir}/rabbitmq-server %config(noreplace) %{_sysconfdir}/logrotate.d/rabbitmq-server %doc LICENSE* -%doc docs/rabbitmq.sample.config +%doc docs/rabbitmq.config.example %clean rm -rf %{buildroot} diff --git a/packaging/windows/Makefile b/packaging/windows/Makefile index d648dfa2..57ed891a 100644 --- a/packaging/windows/Makefile +++ b/packaging/windows/Makefile @@ -10,7 +10,7 @@ dist: mkdir $(SOURCE_DIR)/sbin mv $(SOURCE_DIR)/scripts/*.bat $(SOURCE_DIR)/sbin mkdir $(SOURCE_DIR)/etc - cp $(SOURCE_DIR)/docs/rabbitmq.sample.config $(SOURCE_DIR)/etc/rabbitmq.sample.config + cp $(SOURCE_DIR)/docs/rabbitmq.config.example $(SOURCE_DIR)/etc/rabbitmq.config.example rm -rf $(SOURCE_DIR)/scripts rm -rf $(SOURCE_DIR)/codegen* $(SOURCE_DIR)/Makefile $(SOURCE_DIR)/*mk rm -f $(SOURCE_DIR)/README @@ -28,7 +28,7 @@ dist: todos $(TARGET_DIR)/INSTALL todos $(TARGET_DIR)/LICENSE* todos $(TARGET_DIR)/plugins/README.txt - todos $(TARGET_DIR)/etc/rabbit.sample.config + todos $(TARGET_DIR)/etc/rabbitmq.config.example rm -rf $(TARGET_DIR)/plugins-src zip -q -r $(TARGET_ZIP).zip $(TARGET_DIR) rm -rf $(TARGET_DIR) rabbitmq-service.html |