Merged 20327

10 files changed, 33 insertions, 24 deletions

diff --git a/Makefile b/Makefile
index f924b8e6..e0f01f4c 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,7 @@ distclean: clean
 
 %.gz: %.pod
 	pod2man \
-		-n `echo $$(basename $*) | sed -e 's/\.[^.]\+//'` \
+		-n `echo $$(basename $*) | sed -e 's/\.[[:digit:]]\+//'` \
 		-s `echo $$(basename $*) | sed -e 's/.*\.\([^.]\+\)/\1/'` \
 		-c "RabbitMQ AMQP Server" \
 		-d "" \
diff --git a/docs/rabbitmq-multi.1.pod b/docs/rabbitmq-multi.1.pod
index 82c39116..23fd96ed 100644
--- a/docs/rabbitmq-multi.1.pod
+++ b/docs/rabbitmq-multi.1.pod
@@ -40,7 +40,7 @@ Start 3 local RabbitMQ nodes with unique, sequential port numbers:
 
 =head1 SEE ALSO
 
-rabbitmq-server(1), rabbitmqctl(1)
+rabbitmq.conf(5), rabbitmq-server(1), rabbitmqctl(1)
 
 =head1 AUTHOR
 
diff --git a/docs/rabbitmq-server.1.pod b/docs/rabbitmq-server.1.pod
index 00210c8b..99a7cecc 100644
--- a/docs/rabbitmq-server.1.pod
+++ b/docs/rabbitmq-server.1.pod
@@ -44,7 +44,7 @@ B<RABBITMQ_NODE_PORT>
     Defaults to 5672. 
 
 B<RABBITMQ_CLUSTER_CONFIG_FILE>
-    Defaults to /etc/default/rabbitmq_cluster.config. If this file is
+    Defaults to /etc/rabbitmq/rabbitmq_cluster.config. If this file is
     present it is used by the server to auto-configure a RabbitMQ
     cluster.
     See the clustering guide at http://www.rabbitmq.com/clustering.html
@@ -62,7 +62,7 @@ Run RabbitMQ AMQP server in the background:
 
 =head1 SEE ALSO
 
-rabbitmq-multi(1), rabbitmqctl(1)
+rabbitmq.conf(5), rabbitmq-multi(1), rabbitmqctl(1)
 
 =head1 AUTHOR
 
diff --git a/docs/rabbitmq.5.pod b/docs/rabbitmq.conf.5.pod
index e6972935..9b2536c3 100644
--- a/docs/rabbitmq.5.pod
+++ b/docs/rabbitmq.conf.5.pod
@@ -1,10 +1,10 @@
 =head1 NAME
 
-/etc/default/rabbitmq - default settings for RabbitMQ AMQP server
+/etc/rabbitmq/rabbitmq.conf - default settings for RabbitMQ AMQP server
 
 =head1 DESCRIPTION
 
-/etc/default/rabbitmq contains variable settings that override the
+/etc/rabbitmq/rabbitmq.conf contains variable settings that override the
 defaults built in to the RabbitMQ startup scripts.
 
 The file is interpreted by the system shell, and so should consist of
@@ -13,29 +13,29 @@ syntax is permitted (since the file is sourced using the shell "."
 operator), including line comments starting with "#".
 
 In order of preference, the startup scripts get their values from the
-environment, from /etc/default/rabbitmq, and finally from the built-in
-default values. For example, for the B<RABBITMQ_NODENAME> setting,
+environment, from /etc/rabbitmq/rabbitmq.conf and finally from the
+built-in default values. For example, for the B<RABBITMQ_NODENAME> setting,
 
 B<RABBITMQ_NODENAME>
-    from the environment is checked first. If it is absent or equal
-    to the empty string, then 
+    from the environment is checked first. If it is absent or equal to
+    the empty string, then 
 
 B<NODENAME>
-    from /etc/default/rabbitmq is checked next. If it is also absent
-    or set equal to the empty string, then the default value from the
-    startup script is used.
+    from /etc/rabbitmq/rabbitmq.conf is checked. If it is also absent
+    or set equal to the empty string then the default value from
+    the startup script is used.
 
-The variable names in /etc/default/rabbitmq are always equal to the
+The variable names in /etc/rabbitmq/rabbitmq.conf are always equal to the
 environment variable names, with the B<RABBITMQ_> prefix removed:
 B<RABBITMQ_NODE_PORT> from the environment becomes B<NODE_PORT> in the
-/etc/default/rabbitmq file, etc.
+/etc/rabbitmq/rabbitmq.conf file, etc.
 
 =head1 EXAMPLES
 
-The following is an example of a complete /etc/default/rabbitmq file
+The following is an example of a complete /etc/rabbitmq/rabbitmq.conf file
 that overrides the default Erlang node name from "rabbit" to "hare":
 
-    # I am a complete /etc/default/rabbitmq file.
+    # I am a complete /etc/rabbitmq/rabbitmq.conf file.
     # Comment lines start with a hash character.
     # This is a /bin/sh script file - use ordinary envt var syntax
     NODENAME=hare
@@ -46,7 +46,7 @@ rabbitmq-server(1), rabbitmq-multi(1), rabbitmqctl(1)
 
 =head1 AUTHOR
 
-Originally written by The RabbitMQ Team <info@lshift.net>
+Originally written by The RabbitMQ Team <info@rabbitmq.com>
 
 =head1 COPYRIGHT
 
diff --git a/docs/rabbitmqctl.1.pod b/docs/rabbitmqctl.1.pod
index d2cb0199..17dd8338 100644
--- a/docs/rabbitmqctl.1.pod
+++ b/docs/rabbitmqctl.1.pod
@@ -106,7 +106,8 @@ add_vhost I<vhostpath>
     
 delete_vhost I<vhostpath>
     delete a virtual host I<vhostpath>.
-    That command deletes also all its exchanges, queues and user mappings.
+    That command deletes also all its exchanges, queues and user
+    mappings.
     
 list_vhosts
     list all virtual hosts.
@@ -153,7 +154,8 @@ messages_ready
     number of messages ready to be delivered to clients
 
 messages_unacknowledged
-    number of messages delivered to clients but not yet acknowledged
+    number of messages delivered to clients but not yet
+    acknowledged
 
 messages_uncommitted
     number of messages published in as yet uncommitted transactions
@@ -290,7 +292,7 @@ them:
 
 =head1 SEE ALSO
 
-rabbitmq-multi(1), rabbitmq-server(1)
+rabbitmq.conf(5), rabbitmq-multi(1), rabbitmq-server(1)
 
 =head1 AUTHOR
 
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index bedf8d81..17daeada 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -68,6 +68,8 @@ install -p -D -m 0755 %SOURCE2 %{buildroot}%{_sbindir}/rabbitmq-multi
 mkdir -p %{buildroot}/etc/logrotate.d
 install -m 0644 %SOURCE3 %{buildroot}/etc/logrotate.d/rabbitmq-server
 
+mkdir -p %{buildroot}/etc/rabbitmq
+
 rm %{_maindir}/LICENSE %{_maindir}/LICENSE-MPL-RabbitMQ %{_maindir}/INSTALL
 
 #Build the list of files
@@ -110,6 +112,7 @@ fi
 %defattr(-,root,root,-)
 %dir /var/lib/rabbitmq
 %dir /var/log/rabbitmq
+%dir /etc/rabbitmq
 %{_rabbit_erllibdir}
 %{_rabbit_libdir}
 %{_initrddir}/rabbitmq-server
diff --git a/packaging/debs/Debian/debian/dirs b/packaging/debs/Debian/debian/dirs
index 1a707bc1..625b7d41 100644
--- a/packaging/debs/Debian/debian/dirs
+++ b/packaging/debs/Debian/debian/dirs
@@ -5,4 +5,5 @@ usr/share/man
 var/lib/rabbitmq/mnesia
 var/log/rabbitmq
 etc/logrotate.d
+etc/rabbitmq
 
diff --git a/packaging/debs/Debian/debian/postrm b/packaging/debs/Debian/debian/postrm
index 8d1e92a9..a999d95b 100644
--- a/packaging/debs/Debian/debian/postrm
+++ b/packaging/debs/Debian/debian/postrm
@@ -31,6 +31,9 @@ case "$1" in
         if [ -d /var/run/rabbitmq ]; then
                 rm -r /var/run/rabbitmq
         fi
+        if [ -d /etc/rabbitmq ]; then
+                rm -r /etc/rabbitmq
+        fi
         if getent passwd rabbitmq >/dev/null; then
                 deluser rabbitmq
         fi
diff --git a/scripts/rabbitmq-multi b/scripts/rabbitmq-multi
index 164c5e18..4cf0703a 100755
--- a/scripts/rabbitmq-multi
+++ b/scripts/rabbitmq-multi
@@ -30,7 +30,7 @@
 ##   Contributor(s): ______________________________________.
 ##
 
-[ -f /etc/default/rabbitmq ] && . /etc/default/rabbitmq
+[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf
 
 [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
 [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=rabbit
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 9a35c477..6273804f 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -30,7 +30,7 @@
 ##   Contributor(s): ______________________________________.
 ##
 
-[ -f /etc/default/rabbitmq ] && . /etc/default/rabbitmq
+[ -f /etc/rabbitmq/rabbitmq.conf ] && . /etc/rabbitmq/rabbitmq.conf
 
 [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=${NODENAME}
 [ "x" = "x$RABBITMQ_NODENAME" ] && RABBITMQ_NODENAME=rabbit
@@ -43,7 +43,7 @@
 -kernel inet_default_listen_options [{nodelay,true},{sndbuf,16384},{recbuf,4096}] \
 -kernel inet_default_connect_options [{nodelay,true}]"
 [ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=${CLUSTER_CONFIG_FILE}
-[ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=/etc/default/rabbitmq_cluster.config
+[ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=/etc/rabbitmq/rabbitmq_cluster.config
 [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=${LOG_BASE}
 [ "x" = "x$RABBITMQ_LOG_BASE" ] && RABBITMQ_LOG_BASE=/var/log/rabbitmq
 [ "x" = "x$RABBITMQ_MNESIA_BASE" ] && RABBITMQ_MNESIA_BASE=${MNESIA_BASE}