Migrate Synapse + Email hack

Nomad seemed to dislike the 'auth_port' label, replaced by 'zauthentication_port'

1 files changed, 18 insertions, 22 deletions

diff --git a/app/deployment/email.hcl b/app/deployment/email.hcl
index a51ea27..3d9e15b 100644
--- a/app/deployment/email.hcl
+++ b/app/deployment/email.hcl
@@ -7,7 +7,7 @@ job "email" {
     count = 1
 
     network {
-      port "auth_port" {
+      port "zauthentication_port" {
         static = 1337
         to = 1337
       }
@@ -31,7 +31,7 @@ job "email" {
       config {
         image = "superboum/amd64_dovecot:v2"
         readonly_rootfs = false
-        ports = [ "auth_port", "imaps_port", "imap_port", "lmtp_port" ]
+        ports = [ "zauthentication_port", "imaps_port", "imap_port", "lmtp_port" ]
         command = "dovecot"
         args = [ "-F" ]
         volumes = [
@@ -52,15 +52,14 @@ job "email" {
       }
 
       service {
-        name = "dovecot-auth"
-        port = "auth_port"
-        address_mode = "host"
+        name = "dovecot-imap"
+        port = "imap_port"
         tags = [
-          "dovecot",
+          "dovecot"
         ]
         check {
           type = "tcp"
-          port = "auth_port"
+          port = "imap_port"
           interval = "60s"
           timeout = "5s"
           check_restart {
@@ -72,15 +71,16 @@ job "email" {
       }
 
       service {
-        name = "dovecot-imap"
-        port = "imap_port"
-        address_mode = "host"
+        name = "dovecot-imaps"
+        port = "imaps_port"
         tags = [
-          "dovecot"
+          "dovecot",
+          "(diplonat (tcp_port 993))"
         ]
+
         check {
           type = "tcp"
-          port = "imap_port"
+          port = "imaps_port"
           interval = "60s"
           timeout = "5s"
           check_restart {
@@ -92,17 +92,15 @@ job "email" {
       }
 
       service {
-        name = "dovecot-imaps"
-        port = "imaps_port"
-        address_mode = "host"
+        name = "dovecot-lmtp"
+        port = "lmtp_port"
         tags = [
           "dovecot",
-          "(diplonat (tcp_port 993))"
         ]
 
         check {
           type = "tcp"
-          port = "imaps_port"
+          port = "lmtp_port"
           interval = "60s"
           timeout = "5s"
           check_restart {
@@ -114,16 +112,14 @@ job "email" {
       }
 
       service {
-        name = "dovecot-lmtp"
-        port = "lmtp_port"
-        address_mode = "host"
+        name = "dovecot-auth"
+        port = "zauthentication_port"
         tags = [
           "dovecot",
         ]
-
         check {
           type = "tcp"
-          port = "lmtp_port"
+          port = "zauthentication_port"
           interval = "60s"
           timeout = "5s"
           check_restart {