merge bug24650 into default (Move names for connections and channels from mgmt to broker)

2 files changed, 7 insertions, 6 deletions

diff --git a/packaging/debs/apt-repository/README-real-repository b/packaging/debs/apt-repository/README-real-repository
index b152622731..189852eb60 100644
--- a/packaging/debs/apt-repository/README-real-repository
+++ b/packaging/debs/apt-repository/README-real-repository
@@ -13,7 +13,7 @@ that's a baby rabbit.
 
 Secondly, a note on software. We need a tool to manage the repository, 
 and a tool to perform uploads to the repository. Debian being Debian 
-there are quite a few of each. We will use "rerepro" to manage the 
+there are quite a few of each. We will use "reprepro" to manage the 
 repository since it's modern, maintained, and fairly simple. We will use 
 "dupload" to perform the uploads since it gives us the ability to run 
 arbitrary commands after the upload, which means we don't need to run a 
@@ -99,7 +99,7 @@ machine
 * "rm -rf" the uploads folder
 
 This is a bit cheesy but should be enough for our purposes. The 
-dupload.conf uses scp and ssh so you need a public-key login (or tpye 
+dupload.conf uses scp and ssh so you need a public-key login (or type 
 your password lots).
 
 There's still an open question as to whether dupload is really needed 
diff --git a/packaging/macports/Portfile.in b/packaging/macports/Portfile.in
index 360fb394eb..cde02b1aa9 100644
--- a/packaging/macports/Portfile.in
+++ b/packaging/macports/Portfile.in
@@ -48,6 +48,7 @@ set serveruser  rabbitmq
 set servergroup rabbitmq
 set serverhome ${prefix}/var/lib/rabbitmq
 set logdir ${prefix}/var/log/rabbitmq
+set confdir ${prefix}/etc/rabbitmq
 set mnesiadbdir ${prefix}/var/lib/rabbitmq/mnesia
 set plistloc ${prefix}/etc/LaunchDaemons/org.macports.rabbitmq-server
 set sbindir ${destroot}${prefix}/lib/rabbitmq/bin
@@ -74,6 +75,7 @@ destroot.destdir \
     MAN_DIR=${destroot}${prefix}/share/man
 
 destroot.keepdirs \
+    ${destroot}${confdir} \
     ${destroot}${logdir} \
     ${destroot}${mnesiadbdir}
 
@@ -83,17 +85,16 @@ pre-destroot {
 }
 
 post-destroot {
+    xinstall -d -m 775 ${destroot}${confdir}
     xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${logdir}
     xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${serverhome}
     xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${mnesiadbdir}
 
-    reinplace -E "s:(/etc/rabbitmq/rabbitmq):${prefix}\\1:g" \
+    reinplace -E "s: (/etc/rabbitmq/rabbitmq): ${prefix}\\1:g" \
         ${realsbin}/rabbitmq-env
     foreach var {CONFIG_FILE LOG_BASE MNESIA_BASE ENABLED_PLUGINS_FILE} {
         reinplace -E "s:^($var)=/:\\1=${prefix}/:" \
-            ${realsbin}/rabbitmq-server \
-            ${realsbin}/rabbitmqctl \
-            ${realsbin}/rabbitmq-plugins
+            ${realsbin}/rabbitmq-env
     }
 
     xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \