From 87af01fa2ab876b50f28e4a091544e4ef70266cd Mon Sep 17 00:00:00 2001
From: a-ghanem <ahmedg@mn.uio.no>
Date: Fri, 14 Jan 2022 12:20:41 +0100
Subject: [PATCH 1/3] Use sda-mq service

---
 docker-template.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-template.yml b/docker-template.yml
index a2fd114..fa45e21 100644
--- a/docker-template.yml
+++ b/docker-template.yml
@@ -62,7 +62,7 @@ services:
       retries: 3
 
   mq:
-    image: ghcr.io/uio-bmi/localega-broker-private:latest
+    image: ghcr.io/neicnordic/sda-mq:v1.3.0
     ports:
       - 5671:5671
       - 15671:15671

From 4f52c4da5d6d11bb3b4535417543f542c7a97fc0 Mon Sep 17 00:00:00 2001
From: a-ghanem <ahmedg@mn.uio.no>
Date: Fri, 14 Jan 2022 13:57:13 +0100
Subject: [PATCH 2/3] Use sda-mq environment variables

---
 docker-template.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/docker-template.yml b/docker-template.yml
index fa45e21..799ab68 100644
--- a/docker-template.yml
+++ b/docker-template.yml
@@ -72,12 +72,14 @@ services:
         delay: 5s
         window: 120s
     environment:
-      - VIRTUAL_HOST={{PRIVATE_BROKER_VHOST}}
-      - SSL_VERIFY=verify_peer
-      - SSL_FAIL_IF_NO_PEER_CERT=false
-      - SSL_DEPTH=2
-      - USER_NAME={{PRIVATE_BROKER_USER}}
-      - PASSWORD_HASH={{PRIVATE_BROKER_HASH}}
+      - MQ_VHOST={{PRIVATE_BROKER_VHOST}}
+      - MQ_VERIFY=verify_peer
+      - MQ_USER={{PRIVATE_BROKER_USER}}
+      - MQ_PASSWORD_HASH={{PRIVATE_BROKER_HASH}}
+      - CEGA_CONNECTION={{CEGA_MQ_CONNECTION}}
+      - MQ_SERVER_CERT=/etc/rabbitmq/ssl.cert
+      - MQ_SERVER_KEY=/etc/rabbitmq/ssl.key
+      - MQ_CA=/etc/rabbitmq/CA.cert
     secrets:
       - source: server.pem
         target: /etc/rabbitmq/ssl.cert

From 72b5c288512f436947cf22f22601a233c5a6eb82 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Feb 2022 01:00:08 +0000
Subject: [PATCH 3/3] Bump postgresql from 42.2.8 to 42.2.25

Bumps [postgresql](https://github.com/pgjdbc/pgjdbc) from 42.2.8 to 42.2.25.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.2.8...REL42.2.25)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index deea7af..f6b3c96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.2.8</version>
+            <version>42.2.25</version>
             <scope>test</scope>
         </dependency>
         <dependency>