From caa2ed4dd477edebe173734489130109d63ab056 Mon Sep 17 00:00:00 2001
From: owine <owine@users.noreply.github.com>
Date: Tue, 12 Mar 2024 11:06:12 -0500
Subject: [PATCH] Fixes

---
 roles/rocketchat/defaults/main.yml | 9 +++++----
 roles/rocketchat/tasks/main.yml    | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/roles/rocketchat/defaults/main.yml b/roles/rocketchat/defaults/main.yml
index 75492eb32e..5e3e3dd0f9 100644
--- a/roles/rocketchat/defaults/main.yml
+++ b/roles/rocketchat/defaults/main.yml
@@ -78,17 +78,18 @@ rocketchat_docker_ports: "{{ rocketchat_docker_ports_defaults
 rocketchat_docker_envs_default:
   TZ: "{{ tz }}"
   ROOT_URL: "{{ rocketchat_web_url }}"
-  MONGO_URL: "mongodb://rocketchat_db:27017/rocketchat?replicaSet=rs0"
-  MONGO_OPLOG_URL: "mongodb://rocketchat_db:27017/local?replicaSet=rs0"
+  MONGO_URL: "mongodb://rocketchat_db:27017/rocketchat?replicaSet=rs0&directConnection=true"
+  MONGO_OPLOG_URL: "mongodb://rocketchat_db:27017/local?replicaSet=rs0&directConnection=true"
   DEPLOY_METHOD: "docker"
 rocketchat_docker_envs_custom: {}
 rocketchat_docker_envs: "{{ rocketchat_docker_envs_default
                             | combine(rocketchat_docker_envs_custom) }}"
 
 # Commands
-rocketchat_docker_commands_default: bash -c 'for i in `seq 1 30`; do node main.js && s=$$? && break || s=$$?; echo "Tried $$i times. Waiting 5 secs..."; sleep 5; done; (exit $$s)'
+rocketchat_docker_commands_default: [ bash -c 'for i in `seq 1 30`; do node main.js && s=$$? && break || s=$$?; echo "Tried $$i times. Waiting 5 secs..."; sleep 5; done; (exit $$s)' ]
 rocketchat_docker_commands_custom: []
-rocketchat_docker_commands: "{{ rocketchat_docker_commands_default }}"
+rocketchat_docker_commands: "{{ rocketchat_docker_commands_default 
+                                + rocketchat_docker_commands_custom }}"
 
 # Volumes
 rocketchat_docker_volumes_default:
diff --git a/roles/rocketchat/tasks/main.yml b/roles/rocketchat/tasks/main.yml
index a363b24ba0..71425a9365 100644
--- a/roles/rocketchat/tasks/main.yml
+++ b/roles/rocketchat/tasks/main.yml
@@ -12,7 +12,7 @@
     name: mongodb
   vars:
     mongodb_instances: ["rocketchat_db"]
-    mongodb_docker_image_tag: "5"
+    mongodb_docker_image_tag: "6"
     mongodb_docker_envs_custom:
       MONGODB_REPLICA_SET_MODE: "primary"
       MONGODB_REPLICA_SET_NAME: "rs0"
@@ -42,8 +42,8 @@
 - name: Initialize MongoDB Replica Set
   community.docker.docker_container:
     name: "rocketchat-mongo-init-replica"
-    image: "mongo:5"
-    command: 'bash -c "for i in `seq 1 30`; do mongo rocketchat_db/rocketchat --eval \"rs.initiate({ _id: ''rs0'', members: [ { _id: 0, host: ''localhost:27017'' } ]})\" && s=$$? && break || s=$$?; echo \"Tried $$i times. Waiting 5 secs...\"; sleep 5; done; (exit $$s)"'
+    image: "mongo:6"
+    command: 'bash -c "for i in `seq 1 30`; do mongosh rocketchat_db/rocketchat --eval \"rs.initiate({ _id: ''rs0'', members: [ { _id: 0, host: ''localhost:27017'' } ]})\" && s=$$? && break || s=$$?; echo \"Tried $$i times. Waiting 5 secs...\"; sleep 5; done; (exit $$s)"'
     networks:
       - name: saltbox
     comparisons: