diff options
| author | schneefux <schneefux+commit@schneefux.xyz> | 2017-04-04 12:02:30 +0200 |
|---|---|---|
| committer | schneefux <schneefux+commit@schneefux.xyz> | 2017-04-04 12:02:30 +0200 |
| commit | c2d78419d7d70370255e983ee73a059d18f51bb7 (patch) | |
| tree | 1a58fd7ec873a821dbac231351c9f71c9126d9b0 | |
| parent | 5b44df19c674c20e78747e8fbe035b421c9b369a (diff) | |
| download | vaindock-c2d78419d7d70370255e983ee73a059d18f51bb7.tar.gz vaindock-c2d78419d7d70370255e983ee73a059d18f51bb7.zip | |
rewrite rabbitmq user add script
| -rw-r--r-- | docker-compose.yml | 1 | ||||
| -rw-r--r-- | rabbitmq/add_users.sh | 45 |
2 files changed, 24 insertions, 22 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 07d85dd..48cefdb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -164,6 +164,7 @@ services: vaindock_queue: build: ./rabbitmq + hostname: vaindock_queue volumes: - vaindock_queue-data:/var/lib/queue ports: diff --git a/rabbitmq/add_users.sh b/rabbitmq/add_users.sh index d3dbb36..4f49e76 100644 --- a/rabbitmq/add_users.sh +++ b/rabbitmq/add_users.sh @@ -2,30 +2,31 @@ set -e ( -count=0; -# Execute list_users until service is up and running -until timeout 5 rabbitmqctl list_users >/dev/null 2>/dev/null || (( count++ >= 20 )); do sleep 1; done; -if ! rabbitmqctl list_users | grep bridge > /dev/null +echo "waiting for rabbitmq" +while ! rabbitmqctl list_users &> /dev/null +do + sleep 1 +done +if rabbitmqctl list_users | grep "web" then - # rabbitmqctl delete_user guest - rabbitmqctl add_user web web - rabbitmqctl set_permissions -p / web "^stomp-subscription-" "^stomp-subscription-" "^(amq.topic$|stomp-subscription-)" - # read only amq.topic on host /, but allow stomp subscribe - # services below: all allowed - rabbitmqctl add_user bridge bridge - rabbitmqctl set_permissions -p / bridge ".*" ".*" ".*" - rabbitmqctl add_user apigrabber apigrabber - rabbitmqctl set_permissions -p / apigrabber ".*" ".*" ".*" - rabbitmqctl add_user processor processor - rabbitmqctl set_permissions -p / processor ".*" ".*" ".*" - rabbitmqctl add_user compiler compiler - rabbitmqctl set_permissions -p / compiler ".*" ".*" ".*" - - echo "setup completed" -else - echo "already setup" + echo "users already exist, exiting" + exit 1 fi +echo "creating new users" +# rabbitmqctl delete_user guest +rabbitmqctl add_user web web +rabbitmqctl set_permissions -p / web "^stomp-subscription-" "^stomp-subscription-" "^(amq.topic$|stomp-subscription-)" +# read only amq.topic on host /, but allow stomp subscribe +# services below: all allowed +rabbitmqctl add_user bridge bridge +rabbitmqctl set_permissions -p / bridge ".*" ".*" ".*" +rabbitmqctl add_user apigrabber apigrabber +rabbitmqctl set_permissions -p / apigrabber ".*" ".*" ".*" +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." ) & -# Call original entrypoint exec docker-entrypoint.sh rabbitmq-server $@ |