diff --git a/deployment/develop/docker/docker-compose.yaml b/deployment/develop/docker/docker-compose.yaml index 8289bb1..7e801ff 100644 --- a/deployment/develop/docker/docker-compose.yaml +++ b/deployment/develop/docker/docker-compose.yaml @@ -71,6 +71,8 @@ services: - ./.env:/home/node/app/.env:ro - ./sim-consumidor-objenious.env:/home/node/app/packages/sim-consumidor-objenious/.env:ro - ./sim-objenious-cron.env:/home/node/app/packages/sim-objenious-cron/.env:ro + - ./obj.pem:/home/node/app/packages/sim-consumidor-objenious/obj.pem:ro + - ./obj.pem:/home/node/app/packages/sim-objenious-cron/obj.pem:ro healthcheck: test: [ diff --git a/deployment/develop/jenkinsfile.groovy b/deployment/develop/jenkinsfile.groovy index b5dfa44..4768bfd 100644 --- a/deployment/develop/jenkinsfile.groovy +++ b/deployment/develop/jenkinsfile.groovy @@ -50,6 +50,10 @@ pipeline { cleanRemote: false, execCommand: "ln -sf $BASE_REMOTE_PATH/vault/savefamily/sf-sims/sim-objenious-cron.env $APP_REMOTE_PATH/sim-objenious-cron.env" ), + sshTransfer( + cleanRemote: false, + execCommand: "ln -sf $BASE_REMOTE_PATH/vault/savefamily/sf-sims/obj.pem $APP_REMOTE_PATH/obj.pem" + ), sshTransfer( cleanRemote: false, remoteDirectory: "$APP_REMOTE_PATH", diff --git a/deployment/develop/rabbit/definitions.json b/deployment/develop/rabbit/definitions.json index 6e66b35..50c94d8 100644 --- a/deployment/develop/rabbit/definitions.json +++ b/deployment/develop/rabbit/definitions.json @@ -1,91 +1,83 @@ { - "rabbit_version": "4.2.2", - "rabbitmq_version": "4.2.2", - "product_name": "RabbitMQ", - "product_version": "4.2.2", - "users": [ - { - "name": "guest", - "password": "guest", - "hashing_algorithm": "rabbit_password_hashing_sha256", - "tags": "administrator" - } - ], - "vhosts": [ - { - "name": "sim-vhost" - } - ], - "permissions": [ - { - "user": "guest", - "vhost": "sim-vhost", - "configure": ".*", - "write": ".*", - "read": ".*" - } - ], - "topic_permissions": [], - "parameters": [], - "global_parameters": [ - { - "name": "cluster_name", - "value": "rabbit@a8d5c6e08439" - }, - { - "name": "internal_cluster_id", - "value": "rabbitmq-cluster-id-gXeBLbsUC2W2tU0Bx_QY_w" - } - ], - "policies": [ - { - "vhost": "sim-vhost", - "name": "pol.sim.dlx", - "pattern": "sim.*", - "apply-to": "queues", - "definition": { - "dead-letter-exchange": "sim.dlx" - }, - "priority": 7 - } - ], - "exchanges": [ - { - "name": "sim.exchange", - "vhost": "sim-vhost", - "type": "topic", - "durable": true, - "auto_delete": false, - "internal": false, - "argurments": {} - }, - { - "name": "sim.dlx", - "vhost": "sim-vhost", - "type": "topic", - "durable": true, - "auto_delete": false, - "internal": false, - "argurments": {} - } - ], - "queues": [ - { - "name": "sim.logs", - "vhost": "sim-vhost", - "durable": true, - "auto_delete": false, - "arguments": {} - } - ], - "bindings": [ - { - "source": "sim.exchange", - "vhost": "sim-vhost", - "destination": "sim.logs", - "destination_type": "queue", - "routing_key": "sim.#", - "arguments": {} - } - ] -} + "rabbit_version": "4.2.2", + "rabbitmq_version": "4.2.2", + "product_name": "RabbitMQ", + "product_version": "4.2.2", + "vhosts": [ + { + "name": "sim-vhost" + } + ], + "permissions": [ + { + "user": "guest", + "vhost": "sim-vhost", + "configure": ".*", + "write": ".*", + "read": ".*" + } + ], + "topic_permissions": [], + "parameters": [], + "global_parameters": [ + { + "name": "cluster_name", + "value": "rabbit@a8d5c6e08439" + }, + { + "name": "internal_cluster_id", + "value": "rabbitmq-cluster-id-gXeBLbsUC2W2tU0Bx_QY_w" + } + ], + "policies": [ + { + "vhost": "sim-vhost", + "name": "pol.sim.dlx", + "pattern": "sim.*", + "apply-to": "queues", + "definition": { + "dead-letter-exchange": "sim.dlx" + }, + "priority": 7 + } + ], + "exchanges": [ + { + "name": "sim.exchange", + "vhost": "sim-vhost", + "type": "topic", + "durable": true, + "auto_delete": false, + "internal": false, + "argurments": {} + }, + { + "name": "sim.dlx", + "vhost": "sim-vhost", + "type": "topic", + "durable": true, + "auto_delete": false, + "internal": false, + "argurments": {} + } + ], + "queues": [ + { + "name": "sim.logs", + "vhost": "sim-vhost", + "durable": true, + "auto_delete": false, + "arguments": {} + } + ], + "bindings": [ + { + "source": "sim.exchange", + "vhost": "sim-vhost", + "destination": "sim.logs", + "destination_type": "queue", + "routing_key": "sim.#", + "arguments": {} + } + ] +} \ No newline at end of file diff --git a/deployment/develop/rabbit/rabbitmq.conf b/deployment/develop/rabbit/rabbitmq.conf index a950954..25e4351 100644 --- a/deployment/develop/rabbit/rabbitmq.conf +++ b/deployment/develop/rabbit/rabbitmq.conf @@ -1,3 +1,4 @@ management.load_definitions = /etc/rabbitmq/definitions.json +default_vhost = sim-vhost default_queue_type = quorum \ No newline at end of file