From d2584fbf1d0e1d84447e1724b0bc198e69188192 Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <git@bitsofnetworks.org>
Date: Thu, 17 Oct 2024 01:07:08 +0200
Subject: [PATCH 1/2] bagage: use a different TCP port to avoid conflicts with
 jitsi and sogo

---
 cluster/prod/app/bagage/deploy/bagage.hcl | 4 ++--
 doc/ports                                 | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cluster/prod/app/bagage/deploy/bagage.hcl b/cluster/prod/app/bagage/deploy/bagage.hcl
index fbb571d..76dff22 100644
--- a/cluster/prod/app/bagage/deploy/bagage.hcl
+++ b/cluster/prod/app/bagage/deploy/bagage.hcl
@@ -13,8 +13,8 @@ job "bagage" {
 
     network {
       port "web_port" { 
-        static = 8080
-        to = 8080 
+        static = 8015
+        to = 8015
       }
       port "ssh_port" { 
         static = 2222
diff --git a/doc/ports b/doc/ports
index 73fdb48..984ef2f 100644
--- a/doc/ports
+++ b/doc/ports
@@ -37,6 +37,7 @@ ports so that we can avoid conflicts when adding services.
 5432    psql_proxy
 5433    postgresql
 8008    synapse
+8015    bagage
 8080    jitsi video bridge (prod) / reserved (staging)
 8300    consul
 8301    consul
-- 
2.45.2


From 0c7e85f11750568c751553399a65fac8aa2b8b39 Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <git@bitsofnetworks.org>
Date: Thu, 17 Oct 2024 01:10:50 +0200
Subject: [PATCH 2/2] email: ensure email and email-android7 run on different
 sites to avoid port conflicts

---
 cluster/prod/app/email/deploy/email-android7.hcl | 3 ++-
 cluster/prod/app/email/deploy/email.hcl          | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cluster/prod/app/email/deploy/email-android7.hcl b/cluster/prod/app/email/deploy/email-android7.hcl
index f2f92c6..ad44f2c 100644
--- a/cluster/prod/app/email/deploy/email-android7.hcl
+++ b/cluster/prod/app/email/deploy/email-android7.hcl
@@ -1,5 +1,6 @@
 job "email-android7" {
-  datacenters = ["neptune", "bespin"]
+  # Should not run on the same site as email.hcl (port conflict in diplonat)
+  datacenters = ["scorpio", "bespin"]
   type = "service"
   priority = 100
 
diff --git a/cluster/prod/app/email/deploy/email.hcl b/cluster/prod/app/email/deploy/email.hcl
index 3c6d7b4..10e4d50 100644
--- a/cluster/prod/app/email/deploy/email.hcl
+++ b/cluster/prod/app/email/deploy/email.hcl
@@ -1,4 +1,5 @@
 job "email" {
+  # Should not run on the same site as email-android7.hcl (port conflict in diplonat)
   datacenters = ["neptune"]
   type = "service"
   priority = 65
-- 
2.45.2