Merge lp:~tal-it-innovation/charms/precise/rabbitmq-server/management into lp:charms/rabbitmq-server

[Thomas Leonard]

Allows enabling the management plugin, which is useful for debugging:

juju expose rabbitmq-server
juju set rabbitmq-server management_plugin=True

You can then access the web UI at:

  http://<address>:55672/

(note: this branch continues the fix-ports branch; I don't know how to rebase in bzr)

[Clint Byrum (clint-fewbar)]

Thanks Thomas, this is cool. I've merged all of the changes. You wouldn't really 'rebase' so much as just create a second branch and have changes there. Or with LP merge proposals you can simply mark a different branch as a pre-requisite so the MP's show as separate diffs.

=== modified file 'config.yaml'
--- config.yaml	2012-09-04 14:27:11 +0000
+++ config.yaml	2012-11-21 15:43:23 +0000
@@ -3,9 +3,13 @@
     type: boolean
     default: False
     description: enable SSL
+  management_plugin:
+    type: boolean
+    default: False
+    description: enable the management plugin
   ssl_port:
     type: int
-    default: 5673
+    default: 5671
     description: SSL port
   ssl_key:
     type: string

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2012-09-06 13:20:01 +0000
+++ hooks/config-changed	2012-11-21 15:43:23 +0000
@@ -3,6 +3,16 @@
 
 juju-log "rabbitmq-server: Firing config hook"
 
+export HOME=/root		# (HOME is not set on first run)
+RABBIT_PLUGINS=/usr/lib/rabbitmq/lib/rabbitmq_server-*/sbin/rabbitmq-plugins
+if [ "`config-get management_plugin`" == "True" ]; then
+	$RABBIT_PLUGINS enable rabbitmq_management
+	open-port 55672/tcp
+else
+	$RABBIT_PLUGINS disable rabbitmq_management
+	close-port 55672/tcp
+fi
+
 ssl_enabled=`config-get ssl_enabled`
 
 cd /etc/rabbitmq
@@ -39,6 +49,7 @@
 		{certfile,"$ssl_cert_file"},
 		{keyfile,"$ssl_key_file"}
 	]},
+	open-port `config-get ssl_port`/tcp
 EOF
 fi
 

=== modified file 'hooks/rabbitmq-relations'
--- hooks/rabbitmq-relations	2012-09-14 20:06:14 +0000
+++ hooks/rabbitmq-relations	2012-11-21 15:43:23 +0000
@@ -38,6 +38,7 @@
     install --no-install-recommends rabbitmq-server
   rc=$?
   service rabbitmq-server stop
+  open-port 5672/tcp
 }
 
 function amqp_changed() {

=== modified file 'revision'
--- revision	2012-09-14 20:06:14 +0000
+++ revision	2012-11-21 15:43:23 +0000
@@ -1,1 +1,1 @@
-35
+37