Juju Charms Collection
rabbitmq-server package

Merge lp:~gandelman-a/charms/precise/rabbitmq-server/900440 into lp:charms/rabbitmq-server

  1. Precise Pangolin (12.04)
  2. 900440
  3. Merge into trunk
Proposed by Adam Gandelman
Status: Merged
Merged at revision: 16
Proposed branch: lp:~gandelman-a/charms/precise/rabbitmq-server/900440
Merge into: lp:charms/rabbitmq-server
Diff against target: 32 lines (+4/-4)
2 files modified
hooks/rabbitmq-common (+3/-3)
revision (+1/-1)
To merge this branch: bzr merge lp:~gandelman-a/charms/precise/rabbitmq-server/900440
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+84700@code.launchpad.net

Description of the change

Some needed changes to usage of rabbitmqctl for newer versions.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/rabbitmq-common'
2--- hooks/rabbitmq-common 2011-09-16 21:55:25 +0000
3+++ hooks/rabbitmq-common 2011-12-07 00:56:25 +0000
4@@ -23,11 +23,11 @@
5 ERLANG_COOKIE="/var/lib/rabbitmq/.erlang.cookie"
6
7 function user_exists {
8- $RABBIT_CTL list_users | grep $1 >/dev/null
9+ $RABBIT_CTL list_users | grep -wq "^$1"
10 }
11
12 function user_is_admin {
13- $RABBIT_CTL list_users | grep $1 | grep true >/dev/null
14+ $RABBIT_CTL list_users | grep -w "^$1" | grep -q "administrator"
15 }
16
17 function vhost_exists {
18@@ -51,6 +51,6 @@
19 if [[ $2 == 'admin' ]] ; then
20 user_is_admin $1 && return 0
21 juju-log "rabbitmq: Granting user $1 admin access"
22- $RABBIT_CTL set_admin $1 || return 1
23+ $RABBIT_CTL set_user_tags "$1" administrator || return 1
24 fi
25 }
26
27=== modified file 'revision'
28--- revision 2011-10-12 06:14:13 +0000
29+++ revision 2011-12-07 00:56:25 +0000
30@@ -1,1 +1,1 @@
31-46
32+47

Subscribers

People subscribed via source and target branches