Fixes
This commit is contained in:
parent
cebf87fe61
commit
7743fdcfde
|
@ -1,8 +1,8 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
RABBIT_CTL='rabbitmqctl'
|
RABBIT_CTL='rabbitmqctl'
|
||||||
PASSWD_FILE="/var/run/ensemble/$RABBIT_USER.passwd"
|
|
||||||
HOSTNAME=`hostname -f`
|
HOSTNAME=`hostname -f`
|
||||||
|
|
||||||
function user_exists {
|
function user_exists {
|
||||||
$RABBIT_CTL list_users | grep $1 >/dev/null
|
$RABBIT_CTL list_users | grep $1 >/dev/null
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,17 +3,24 @@ set -u
|
||||||
FORMULA_DIR=$(dirname $0)
|
FORMULA_DIR=$(dirname $0)
|
||||||
ARG0=${0##*/}
|
ARG0=${0##*/}
|
||||||
|
|
||||||
|
if [[ -e $FORMULA_DIR/rabbitmq-common ]] ; then
|
||||||
|
. $FORMULA_DIR/rabbitmq-common
|
||||||
|
else
|
||||||
|
ensemble-log "rabbitmq: ERROR Could not load $FORMULA_DIR/rabbitmq-common"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
ensemble-log "rabbitmq: Firing hook $ARG0."
|
ensemble-log "rabbitmq: Firing hook $ARG0."
|
||||||
|
|
||||||
DEFAULT_ETH=$(ip route | grep default | awk '{ print $5 }')
|
|
||||||
IP=$(ifconfig $DEFAULT_ETH | grep 'inet addr' | awk '{ print $2 }' | cut -d: -f2)
|
|
||||||
|
|
||||||
|
|
||||||
function install_hook() {
|
function install_hook() {
|
||||||
|
DEFAULT_ETH=$(ip route | grep default | awk '{ print $5 }')
|
||||||
|
IP=$(ifconfig $DEFAULT_ETH | grep 'inet addr' | awk '{ print $2 }' | cut -d: -f2)
|
||||||
|
|
||||||
if ! cat /etc/hosts | grep "$IP $HOSTNAME" >>/dev/null; then
|
if ! cat /etc/hosts | grep "$IP $HOSTNAME" >>/dev/null; then
|
||||||
echo "Updating /etc/hosts"
|
echo "Updating /etc/hosts"
|
||||||
echo $IP $HOSTNAME >> /etc/hosts
|
echo $IP $HOSTNAME >> /etc/hosts
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[[ ! `which pwgen` ]] && apt-get -y install pwgen
|
[[ ! `which pwgen` ]] && apt-get -y install pwgen
|
||||||
apt-get -y install rabbitmq-server
|
apt-get -y install rabbitmq-server
|
||||||
rc=$?
|
rc=$?
|
||||||
|
@ -23,6 +30,7 @@ function install_hook() {
|
||||||
function amqp_changed() {
|
function amqp_changed() {
|
||||||
RABBIT_USER=`relation-get username`
|
RABBIT_USER=`relation-get username`
|
||||||
[[ -z $RABBIT_USER ]] && exit 0
|
[[ -z $RABBIT_USER ]] && exit 0
|
||||||
|
PASSWD_FILE="/var/run/ensemble/$RABBIT_USER.passwd"
|
||||||
if [[ -e $PASSWD_FILE ]] ; then
|
if [[ -e $PASSWD_FILE ]] ; then
|
||||||
PASSWORD=$(cat $PASSWD_FILE)
|
PASSWORD=$(cat $PASSWD_FILE)
|
||||||
else
|
else
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ensemble: formula
|
ensemble: formula
|
||||||
name: rabbitmq
|
name: rabbitmq
|
||||||
revision: 19
|
revision: 24
|
||||||
summary: "An AMQP server written in Erlang"
|
summary: "An AMQP server written in Erlang"
|
||||||
description: |
|
description: |
|
||||||
RabbitMQ is an implementation of AMQP, the emerging standard for high
|
RabbitMQ is an implementation of AMQP, the emerging standard for high
|
||||||
|
|
Loading…
Reference in New Issue