summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschneefux <schneefux+commit@schneefux.xyz>2017-04-04 12:56:00 +0200
committerschneefux <schneefux+commit@schneefux.xyz>2017-04-04 12:56:00 +0200
commit23092ac9c2a6827f711498e1c8e1b2e9254e3c39 (patch)
tree382b50254d25f407b433b32f46d80e096f80af6c
parenta63d865cf351c36f0fcd3236072a8e6e00061e32 (diff)
downloadvaindock-23092ac9c2a6827f711498e1c8e1b2e9254e3c39.tar.gz
vaindock-23092ac9c2a6827f711498e1c8e1b2e9254e3c39.zip
add queue option to reset on start
-rw-r--r--docker-compose.yml1
-rw-r--r--rabbitmq/add_users.sh21
2 files changed, 9 insertions, 13 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 48cefdb..9a17675 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -176,6 +176,7 @@ services:
- "8881:15672" # management guest/guest
environment:
- RABBITMQ_HIPE_COMPILE=1
+ - RABBITMQ_RECREATE_ON_STARTUP=true # for debugging
volumes:
vaindock_db-web-data:
diff --git a/rabbitmq/add_users.sh b/rabbitmq/add_users.sh
index 4f49e76..70554e9 100644
--- a/rabbitmq/add_users.sh
+++ b/rabbitmq/add_users.sh
@@ -1,18 +1,13 @@
#!/usr/bin/env bash
-set -e
-
(
-echo "waiting for rabbitmq"
-while ! rabbitmqctl list_users &> /dev/null
-do
- sleep 1
-done
-if rabbitmqctl list_users | grep "web"
-then
- echo "users already exist, exiting"
- exit 1
+if [[ $RABBITMQ_RECREATE_ON_STARTUP ]]; then
+ echo "*** *** deleting all data *** ***"
+ rm -r "/var/lib/rabbitmq/mnesia/rabbit@$(hostname)/"
fi
-echo "creating new users"
+echo "*** *** waiting for rabbitmq *** ***"
+until rabbitmqctl status &>/dev/null; do sleep 1; done
+sleep 5
+echo "*** *** creating users *** ***"
# rabbitmqctl delete_user guest
rabbitmqctl add_user web web
rabbitmqctl set_permissions -p / web "^stomp-subscription-" "^stomp-subscription-" "^(amq.topic$|stomp-subscription-)"
@@ -26,7 +21,7 @@ rabbitmqctl add_user processor processor
rabbitmqctl set_permissions -p / processor ".*" ".*" ".*"
rabbitmqctl add_user compiler compiler
rabbitmqctl set_permissions -p / compiler ".*" ".*" ".*"
-echo "custom rabbitmq setup done."
+echo "*** *** custom rabbitmq setup done. *** ***"
) &
exec docker-entrypoint.sh rabbitmq-server $@