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

[Thomas Leonard]

This branch contains two fixes related to ports:

- it changes the default for the SSL port to the official port number (5671)
- it uses open-port to expose the ports, for use by clients not deployed by Juju

=== modified file 'config.yaml'
--- config.yaml	2012-09-04 14:27:11 +0000
+++ config.yaml	2012-11-21 15:07:22 +0000
@@ -5,7 +5,7 @@
     description: enable SSL
   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:07:22 +0000
@@ -39,6 +39,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:07:22 +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:07:22 +0000
@@ -1,1 +1,1 @@
-35
+36