diff options
| author | schneefux <schneefux+commit@schneefux.xyz> | 2017-04-03 16:26:41 +0200 |
|---|---|---|
| committer | schneefux <schneefux+commit@schneefux.xyz> | 2017-04-03 16:26:41 +0200 |
| commit | 5b44df19c674c20e78747e8fbe035b421c9b369a (patch) | |
| tree | 67e18100ce296d9011a34432b1480c3e8032dd13 | |
| parent | 4699d9048260789bdc5bfcb21e00e2d476dc27c9 (diff) | |
| download | vaindock-5b44df19c674c20e78747e8fbe035b421c9b369a.tar.gz vaindock-5b44df19c674c20e78747e8fbe035b421c9b369a.zip | |
rename updater -> bridge
| -rw-r--r-- | docker-compose.yml | 9 | ||||
| -rw-r--r-- | rabbitmq/add_users.sh | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/docker-compose.yml b/docker-compose.yml index 844cb05..07d85dd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -89,19 +89,18 @@ services: - "88:80" - "443:443" - vaindock_updater: - build: ../updater + vaindock_bridge: + build: ../bridge ports: - "8880:8880" volumes: - - ../updater:/usr/src/app + - ../bridge:/usr/src/app - ../orm:/usr/src/orm depends_on: - vaindock_queue - vaindock_db-web environment: - - RABBITMQ_URI=amqp://updater:updater@vaindock_queue/ - - DATABASE_URI=mysql://vainweb:vainweb@vaindock_db-web/vainweb + - RABBITMQ_URI=amqp://bridge:bridge@vaindock_queue/ env_file: - local.env diff --git a/rabbitmq/add_users.sh b/rabbitmq/add_users.sh index 8b78f9c..d3dbb36 100644 --- a/rabbitmq/add_users.sh +++ b/rabbitmq/add_users.sh @@ -5,15 +5,15 @@ 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 updater > /dev/null +if ! rabbitmqctl list_users | grep bridge > /dev/null 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 updater updater - rabbitmqctl set_permissions -p / updater ".*" ".*" ".*" + 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 |